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

Browse source

Pull to receive:

 c0e8ddc76d ("sched_ext: Align cgroup #ifdef guards with SUB_SCHED vs GROUP_SCHED")

which conflicts with:

 41e3312861 ("sched_ext: add p->scx.tid and SCX_OPS_TID_TO_TASK lookup")

It's a simple context conflict. Take changes from both.

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

...

This commit is contained in:

Tejun Heo 2026-04-24 14:37:32 -10:00

parent c2929bc21d deb7b2f93d

commit dfe454e37b

3 changed files with 223 additions and 97 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

299

kernel/sched/ext.c

View file

19

kernel/sched/ext_idle.c

View file

2

kernel/sched/ext_internal.h

View file