diff options
| author | Tejun Heo <tj@kernel.org> | 2026-04-03 07:48:28 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-04-03 07:48:28 -1000 |
| commit | 744ab12a5bd1a0dc59c5ba5354ae40030c834a46 (patch) | |
| tree | 5834bf4c459909446df2414d98d827c50afcc25e /tools/perf/scripts/python/bin/stackcollapse-record | |
| parent | b905ee77d5f557a83a485b4146210f54f13365fc (diff) | |
| parent | 7e0ffb72de8aa3b25989c2d980e81b829c577010 (diff) | |
Merge branch 'for-7.0-fixes' into for-7.1
Conflict in kernel/sched/ext.c between:
7e0ffb72de8a ("sched_ext: Fix stale direct dispatch state in
ddsp_dsq_id")
which clears ddsp state at individual call sites instead of
dispatch_enqueue(), and sub-sched related code reorg and API updates on
for-7.1. Resolved by applying the ddsp fix with for-7.1's signatures.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/bin/stackcollapse-record')
0 files changed, 0 insertions, 0 deletions