Commit 28174b15 authored by Carlos Llamas's avatar Carlos Llamas Committed by Treehugger Robot
Browse files

Merge eaed94d1 ("Merge tag 'sched-core-2025-05-25' of... 

Merge eaed94d1 ("Merge tag 'sched-core-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip"

) into android-mainline

Steps on the way to 6.16-rc1

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

Cc: John Stultz <jstultz@google.com>
Change-Id: Ib05e6b0e4ffaa1616bd5c54fd000e7a477da085a
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
parents 8ecace13 eaed94d1
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