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 /include/uapi/linux/android/ssh:/git@git.zx2c4.com | |
| parent | selftests/sched_ext: Add test for scx_bpf_select_cpu_and() (diff) | |
| parent | sched_ext: Mark SCX_OPS_HAS_CGROUP_WEIGHT for deprecation (diff) | |
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 'include/uapi/linux/android/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions