linux/kernel/sched
Ingo Molnar be602cde65 Merge branch 'linus' into sched/urgent, to resolve conflict
Conflicts:
	kernel/sched/ext.c

There's a context conflict between this upstream commit:

  3fdb9ebcec sched_ext: Start schedulers with consistent p->scx.slice values

... and this fix in sched/urgent:

  98442f0ccd sched: Fix delayed_dequeue vs switched_from_fair()

Resolve it.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2024-10-17 09:58:07 +02:00
..
autogroup.c
autogroup.h
build_policy.c
build_utility.c
clock.c
completion.c
core.c Merge branch 'linus' into sched/urgent, to resolve conflict 2024-10-17 09:58:07 +02:00
core_sched.c
cpuacct.c
cpudeadline.c
cpudeadline.h
cpufreq.c
cpufreq_schedutil.c Merge branch 'tip/sched/core' into sched_ext/for-6.12 2024-09-11 08:43:26 -10:00
cpupri.c
cpupri.h
cputime.c
deadline.c sched/deadline: Use hrtick_enabled_dl() before start_hrtick_dl() 2024-10-11 10:49:32 +02:00
debug.c Merge branch 'tip/sched/core' into sched_ext/for-6.12 2024-09-11 08:43:26 -10:00
ext.c Merge branch 'linus' into sched/urgent, to resolve conflict 2024-10-17 09:58:07 +02:00
ext.h
fair.c sched: Fix delayed_dequeue vs switched_from_fair() 2024-10-11 10:49:32 +02:00
features.h
idle.c
isolation.c
loadavg.c
Makefile
membarrier.c
pelt.c sched: Move update_other_load_avgs() to kernel/sched/pelt.c 2024-09-11 20:00:21 -10:00
pelt.h sched: Move update_other_load_avgs() to kernel/sched/pelt.c 2024-09-11 20:00:21 -10:00
psi.c sched: psi: fix bogus pressure spikes from aggregation race 2024-10-03 16:03:16 -07:00
rt.c
sched-pelt.h
sched.h Merge branch 'linus' into sched/urgent, to resolve conflict 2024-10-17 09:58:07 +02:00
smp.h
stats.c
stats.h sched/psi: Fix mistaken CPU pressure indication after corrupted task state bug 2024-10-14 09:11:42 +02:00
stop_task.c
swait.c
syscalls.c sched: Fix delayed_dequeue vs switched_from_fair() 2024-10-11 10:49:32 +02:00
topology.c
wait.c
wait_bit.c