Merge branch 'for-7.2-fixes' into for-7.3

Browse source

Pull to receive:

 477869bfaf ("sched_ext: Reject setting disallow from init_task outside the enable path")
 5f8b69642d ("sched_ext: Take cgroup_lock() first in scx_cgroup_lock()")
 8c13364db9 ("sched_ext: Skip sub-disable teardown for never-linked sub-schedulers")
 5cdc928598 ("sched_ext: Don't enable non-ext tasks in the sub-sched task loops")

as dependencies for the upcoming cgroup migration patchset and to
resolve the conflicts with the ext.c/sub.c split on for-7.3.

5f8b69642d comments scx_cgroup_lock() which for-7.3 exported for
sub.c. Resolved by keeping the exported version with the comment.

8c13364db9 and 5cdc928598 patch the pre-split sub-sched enable and
disable paths in ext.c which for-7.3 moved to sub.c. Resolved by
applying the never-linked teardown skip and the class gates to sub.c.

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

...

This commit is contained in:

Tejun Heo 2026-07-17 21:42:18 -10:00

parent 8946dbd3aa 5cdc928598

commit 7c2cd76770

3 changed files with 54 additions and 14 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

10

include/linux/sched/ext.h

View file

23

kernel/sched/ext/ext.c

View file

35

kernel/sched/ext/sub.c

View file