sched_ext: Merge branch 'for-6.15-fixes' into for-6.16

Browse source

Pull for-6.15-fixes to receive:

 e776b26e37 ("sched_ext: Remove cpu.weight / cpu.idle unimplemented warnings")

which conflicts with:

 1a7ff7216c ("sched_ext: Drop "ops" from scx_ops_enable_state and friends")

The former removes code updated by the latter. Resolved by removing the
updated section.

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

...

This commit is contained in:

Tejun Heo 2025-04-08 08:56:57 -10:00

parent 01d541baed bc08b15b54

commit 294f5ff474

2 changed files with 8 additions and 43 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

49

kernel/sched/ext.c

View file

2

tools/sched_ext/scx_flatcg.bpf.c

View file