Commit c05e84a2 authored by Carlos Llamas's avatar Carlos Llamas
Browse files

Merge bf76f23a ("Merge tag 'sched-core-2025-07-28' of...

Merge bf76f23a ("Merge tag 'sched-core-2025-07-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip"

) into android-mainline

Steps on the way to v6.17-rc1

Resolves merge conflicts in:
	kernel/sched/core.c
	kernel/sched/cputime.c
	kernel/sched/fair.c
	kernel/sched/pelt.h
	kernel/sched/rt.c
	kernel/sched/sched.h
	kernel/sched/topology.c
	kernel/sched/wait.c

Cc: John Stultz <jstultz@google.com>
Change-Id: I4ca876f09129b8aba4facaccd5e7d8f5842aa8f9
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
parents 874acf57 bf76f23a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment