diff options
| author | Tejun Heo <tj@kernel.org> | 2026-10-13 11:26:22 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-10-13 11:26:22 -1000 |
| commit | a5ba5c61951dc00d296c79e96f0259b87861ce8c (patch) | |
| tree | 0c9f088e82abfb32ee90987b0dd3b533b4fd14e6 /tools/perf/scripts/python/flamegraph.py | |
| parent | d1350c523f481769182604d758ecfcdf3597b402 (diff) | |
| parent | 2935062be77113c1c4565ca9d0c72180449aafee (diff) | |
sched_ext: Merge branch 'for-7.3-fixes' into for-7.4
Pull to receive 2935062be771 ("sched_ext: Wait for SCX_OPSS_DISPATCHING
before moving tasks off DSQs") and resolve its conflicts with the proxy
execution and reject DSQ work here so that for-next merges clean.
Conflicts:
- unlink_dsq_and_switch_rq_lock(): efa7bc7d7195 ("sched_ext: Avoid relocking
DSQ during remote consumption") clears p->scx.dsq in the success branch
and 2935062be771 adds the wait there. Kept both, the wait after the clear,
so that the proxy reject in consume_remote_task() is covered too.
- scx_reenq_reject(): 18f5c699d1d0 ("sched_ext: Rename
scx_reenq_wait_dispatching() to scx_wait_dispatching()") renames the call
in sub.c while cea8b60e4aee ("sched_ext: Move reject DSQ draining into
core") moved the function into ext.c. Dropped the sub.c side and applied
the rename at the new home.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/flamegraph.py')
0 files changed, 0 insertions, 0 deletions