Commit 57bae874 authored by Carlos Llamas's avatar Carlos Llamas Committed by Treehugger Robot
Browse files

Merge a23cd25b ("Merge tag 'sched_ext-for-6.18' of... 

Merge a23cd25b ("Merge tag 'sched_ext-for-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext"

) into android-mainline

Steps on the way to v6.18-rc1

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

Cc: John Stultz <jstultz@google.com>
Change-Id: Idd7cee195dd0207db139450e1f5896cc82600df1
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
parents 5c5809e6 a23cd25b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment