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:

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

... and this fix in sched/urgent:

  98442f0ccd82 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

scheduler: Remove the now superfluous sentinel elements from ctl_table array

2024-04-24 09:43:54 +02:00

autogroup.h

sched/headers: Add header guard to kernel/sched/stats.h and kernel/sched/autogroup.h

2022-02-23 08:22:00 +01:00

build_policy.c

sched_ext: Disallow loading BPF scheduler if isolcpus= domain isolation is in effect

2024-07-08 09:30:13 -10:00

build_utility.c

sched/headers: Remove duplicate header inclusions

2023-10-03 21:27:55 +02:00

clock.c

sched: Fix spelling in comments

2024-05-27 17:00:21 +02:00

completion.c

sched: add a few helpers to wake up tasks on the current cpu

2023-07-17 16:08:08 -07:00

core_sched.c

sched: Fix spelling in comments

2024-05-27 17:00:21 +02:00

core.c

Merge branch 'linus' into sched/urgent, to resolve conflict

2024-10-17 09:58:07 +02:00

cpuacct.c

Merge branch 'sched/fast-headers' into sched/core

2022-03-15 09:05:05 +01:00

cpudeadline.c

sched/topology: Consolidate and clean up access to a CPU's max compute capacity

2023-10-09 12:59:48 +02:00

cpudeadline.h

sched/headers: Simplify and clean up header usage in the scheduler

2018-03-04 12:39:29 +01:00

cpufreq_schedutil.c

Merge branch 'tip/sched/core' into sched_ext/for-6.12

2024-09-11 08:43:26 -10:00

cpufreq.c

sched/headers: Introduce kernel/sched/build_utility.c and build multiple .c files there

2022-02-23 10:58:33 +01:00

cpupri.c

sched/rt: Fix live lock between select_fallback_rq() and RT push

2023-09-28 22:58:13 +02:00

cpupri.h

sched/cpupri: Add CPUPRI_HIGHER

2020-10-29 11:00:30 +01:00

cputime.c

sched/cputime: Fix mul_u64_u64_div_u64() precision for cputime

2024-07-29 12:22:32 +02:00

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

sched_ext: Add cgroup support

2024-09-04 10:24:59 -10:00

fair.c

sched: Fix delayed_dequeue vs switched_from_fair()

2024-10-11 10:49:32 +02:00

features.h

sched/eevdf: Allow shorter slices to wakeup-preempt

2024-08-17 11:06:45 +02:00

idle.c

Merge branch 'tip/sched/core' into for-6.12

2024-09-03 12:49:18 -10:00

isolation.c

sched/isolation: Fix boot crash when maxcpus < first housekeeping CPU

2024-04-28 10:08:21 +02:00

loadavg.c

sched: Fix spelling in comments

2024-05-27 17:00:21 +02:00

Makefile

sched/headers: Introduce kernel/sched/build_policy.c and build multiple .c files there

2022-02-23 10:58:33 +01:00

membarrier.c

RISC-V Patches for the 6.9 Merge Window

2024-03-22 10:41:13 -07:00

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: Add put_prev_task(.next)

2024-09-03 15:26:32 +02:00

sched-pelt.h

sched/fair: Fix "runnable_avg_yN_inv" not used warnings

2019-06-17 12:15:58 +02:00

sched.h

Merge branch 'linus' into sched/urgent, to resolve conflict

2024-10-17 09:58:07 +02:00

smp.h

sched, smp: Trace smp callback causing an IPI

2023-03-24 11:01:29 +01:00

stats.c

profiling: remove profile=sleep support

2024-08-04 13:36:28 -07:00

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

sched: Add put_prev_task(.next)

2024-09-03 15:26:32 +02:00

swait.c

sched: add a few helpers to wake up tasks on the current cpu

2023-07-17 16:08:08 -07:00

syscalls.c

sched: Fix delayed_dequeue vs switched_from_fair()

2024-10-11 10:49:32 +02:00

topology.c

sched/fair: Fair server interface

2024-07-29 12:22:36 +02:00

wait_bit.c

sched: Fix spelling in comments

2024-05-27 17:00:21 +02:00

wait.c

sched: remove wait bookmarks

2023-10-18 14:34:18 -07:00