Commit 506f6a35 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5d3c0db4 ("Merge tag 'sched-core-2021-08-30' of...

Merge 5d3c0db4 ("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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I73e7bfc310639dae4ca5df7b63d47fa32a171760
parents 0fada0a4 5d3c0db4
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment