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

Browse source

Pull to receive:

 2d2b026c3e ("sched_ext: Deny SCX kfuncs to non-SCX struct_ops programs")

which modifies scx_kfunc_context_filter() to avoid conflicts with planned
changes in for-7.2.

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

...

This commit is contained in:

Tejun Heo 2026-04-20 09:33:34 -10:00

parent acfbd1552e 5897ca15d2

commit 463a4436d6

6 changed files with 112 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

32

kernel/sched/ext.c

View file

1

kernel/sched/ext_idle.c

View file

1

kernel/sched/ext_idle.h

View file

1

tools/testing/selftests/sched_ext/Makefile

View file

44

tools/testing/selftests/sched_ext/non_scx_kfunc_deny.bpf.c

View file

47

tools/testing/selftests/sched_ext/non_scx_kfunc_deny.c

View file