Merge tag 'locking-urgent-2020-08-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (eb1319af) · Commits · 戴 / test

Pull locking fixlets from Ingo Molnar: "A documentation fix and a 'fallthrough' macro update" * tag 'locking-urgent-2020-08-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: futex: Convert to use the preferred 'fallthrough' macro Documentation/locking/locktypes: Fix a typo

kernel/futex.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3744,12 +3744,12 @@ long do_futex(u32 __user uaddr, int op, u32 val, ktime_t timeout,
		switch (cmd) {
		case FUTEX_WAIT:
		val3 = FUTEX_BITSET_MATCH_ANY;
		/* fall through */
		fallthrough;
		case FUTEX_WAIT_BITSET:
		return futex_wait(uaddr, flags, val, timeout, val3);
		case FUTEX_WAKE:
		val3 = FUTEX_BITSET_MATCH_ANY;
		/* fall through */
		fallthrough;
		case FUTEX_WAKE_BITSET:
		return futex_wake(uaddr, flags, val, val3);
		case FUTEX_REQUEUE:

Admin message