diff options
| author | Tejun Heo <tj@kernel.org> | 2026-07-09 11:26:26 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-07-09 11:41:10 -1000 |
| commit | ad45691d8c73075baa1ada6cf2d55c0245259750 (patch) | |
| tree | b18ceb79737f35cf1f70e9038e796a4680bb8005 /tools/perf/scripts/python | |
| parent | e655c1f1bd14804f398df7da029c4a7e3f9ccd7f (diff) | |
| parent | e6979d05c6a6fe79980f08d63f039f0b27c30a1c (diff) | |
Merge branch 'for-7.2-fixes' into for-7.3
Pull to receive:
db4e9defd2e8 ("sched_ext: Record an error on errno-only sub-enable failure")
49b3378a750c ("sched_ext: Fix premature ops->priv publication in scx_alloc_and_add_sched()")
e6979d05c6a6 ("tools/sched_ext: scx - Fix cmask_subset(), cmask_equal() and cmask_weight()")
for further sub-sched changes and to resolve the conflicts with the
sub-sched updates on for-7.3.
db4e9defd2e8 adds scx_error() to the sub-enable err_disable sink which
for-7.3 moved from ext.c into sub.c. Resolved by applying the fix to
scx_sub_enable_workfn() in sub.c.
49b3378a750c drops RCU_INIT_POINTER() from an scx_alloc_and_add_sched()
unwind label whose body changed with for-7.3's stall_cpus addition.
Resolved by dropping the line from the updated unwind.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions
