mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-13 07:31:07 +00:00
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>
This commit is contained in:
Tejun Heo
commit
fab183d632
4911 changed files with 79683 additions and 27975 deletions
35
.mailmap
35
.mailmap
7
CREDITS
7
CREDITS
127
MAINTAINERS
127
MAINTAINERS
23
Makefile
23
Makefile
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue