Commit 732e4b98 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 9a7e0a90 ("Merge tag 'sched-core-2021-11-01' of...

Merge 9a7e0a90 ("Merge tag 'sched-core-2021-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip"

) into android-mainline

Steps on the way to 5.16-rc1.

Resolves merge conflicts in:
	kernel/irq_work.c
	kernel/sched/core.c
	kernel/sched/fair.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I4b144ffba858a38a417e9d71d76c23d015b7aa9b
parents 24430bad 9a7e0a90
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment