diff options
| author | Tejun Heo <tj@kernel.org> | 2025-04-08 08:56:57 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-04-08 08:56:57 -1000 |
| commit | 294f5ff47405f920d85b8d411ddbc52ed708a423 (patch) | |
| tree | aea5007d8a9ab3642a2a9f7c2575184db4f91d1b /tools/sched_ext | |
| parent | 01d541baedd74530831c8c98b946622cb7487f30 (diff) | |
| parent | bc08b15b54b8aadbc8a8f413271c07a3f4bead87 (diff) | |
| download | linux-next-294f5ff47405f920d85b8d411ddbc52ed708a423.tar.gz linux-next-294f5ff47405f920d85b8d411ddbc52ed708a423.zip | |
sched_ext: Merge branch 'for-6.15-fixes' into for-6.16
Pull for-6.15-fixes to receive:
e776b26e3701 ("sched_ext: Remove cpu.weight / cpu.idle unimplemented warnings")
which conflicts with:
1a7ff7216c8b ("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>
Diffstat (limited to 'tools/sched_ext')
| -rw-r--r-- | tools/sched_ext/scx_flatcg.bpf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/sched_ext/scx_flatcg.bpf.c b/tools/sched_ext/scx_flatcg.bpf.c index 2c720e3ecad5..fdc7170639e6 100644 --- a/tools/sched_ext/scx_flatcg.bpf.c +++ b/tools/sched_ext/scx_flatcg.bpf.c @@ -950,5 +950,5 @@ SCX_OPS_DEFINE(flatcg_ops, .cgroup_move = (void *)fcg_cgroup_move, .init = (void *)fcg_init, .exit = (void *)fcg_exit, - .flags = SCX_OPS_HAS_CGROUP_WEIGHT | SCX_OPS_ENQ_EXITING, + .flags = SCX_OPS_ENQ_EXITING, .name = "flatcg"); |