Merge 595b28fb ("Merge tag 'locking-core-2021-10-31' of...

Merge 595b28fb ("Merge tag 'locking-core-2021-10-31' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip"

) into android-mainline

Steps on the way to 5.16-rc1

Resolves conflicts with:
	kernel/sched/core.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id00b97b9373792e736005a410e35aa6a2828cba1