Greg Kroah-Hartman 506f6a3567 Merge 5d3c0db459 ("Merge tag 'sched-core-2021-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline ...

Steps on the way to 5.15-rc1.

Resolves merge conflicts with:
	kernel/fork.c
	kernel/sched/core.c

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

2021-09-02 11:02:37 +02:00

7.2 KiB

Raw Blame History

View Raw