sched_ext: Merge branch 'for-6.17-fixes' into for-6.18

Browse source

Pull sched_ext/for-6.17-fixes to receive:

 55ed11b181 ("sched_ext: idle: Handle migration-disabled tasks in BPF code")

which conflicts with the following commit in for-6.18:

 2407bae23d ("sched_ext: Add the @sch parameter to ext_idle helpers")

The conflict is a simple context conflict which can be resolved by taking
the updated parts from both commits.

Signed-off-by: Tejun Heo <tj@kernel.org>

...

This commit is contained in:

Tejun Heo 2025-09-23 09:10:20 -10:00

parent c0008a5632 55ed11b181

commit ebfd5226ec

4 changed files with 33 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

kernel/sched/core.c

View file

10

kernel/sched/ext.c

View file

28

kernel/sched/ext_idle.c

View file

1

tools/testing/selftests/sched_ext/hotplug.c

View file