linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-27 15:17:04 -04:00

Files

Tejun Heo fab183d632 sched_ext: Merge branch 'for-7.3-arena-args' into for-7.3

Pull to receive the __arena argument conversion:

 67f1f4a48c ("sched_ext: Pass kernel arena pointers to ops_cid callbacks")
 a8dc810968 ("sched_ext: Convert sub-cap kfuncs to __arena cmask arguments")
 a05c5b5cb5 ("sched_ext: Convert scx_bpf_cid_override() to __arena array arguments")

along with the bpf-next branch carrying the __arena argument support they
depend on.

Conflict in kernel/sched/ext/ext.c between:

 c384ab8a0b ("sched_ext: Move the config-off sub-cap kfunc stubs into sub.c")

and:

 a8dc810968 ("sched_ext: Convert sub-cap kfuncs to __arena cmask arguments")

which updated the stubs in their old ext.c location. Resolved by keeping
ext.c without the stubs and applying the prototype conversion to the
relocated stubs in sub.c.

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

2026-08-17 11:20:34 -10:00

arena.c

sched_ext: Pass kernel arena pointers to ops_cid callbacks

2026-08-12 09:55:33 -10:00

arena.h

sched_ext: Make kernel/sched/ext/ sources self-contained for clangd

2026-06-22 10:41:26 -10:00

cid.c

sched_ext: Convert scx_bpf_cid_override() to __arena array arguments

2026-08-12 09:55:33 -10:00

cid.h

sched_ext: Gate cid kfuncs behind the SCX struct_ops check