diff options
| author | Tejun Heo <tj@kernel.org> | 2026-09-30 07:58:15 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-09-30 07:58:15 -1000 |
| commit | 972cf7de2cbe127d3e55cf0a413c78754fa6a8e4 (patch) | |
| tree | a027c7ef30cbbe86a80e929f56370808e1413d3b /tools/perf/scripts/python/stackcollapse.py | |
| parent | f2f095c87603b8dfb6752e130d902970371c3852 (diff) | |
| parent | cc07fae1de5dbf514a9a3978050ee3cf5fe20d3c (diff) | |
sched_ext: Merge branch 'for-7.3-fixes' into for-7.4
Pull to receive cc07fae1de5d ("selftests/sched_ext: Add a test for
ops.dequeue() on remote local DSQ moves") and resolve its conflict with
f73ec6791424 ("sched_ext: Add selftest for blocked donor admission") here
so that for-next merges clean.
Conflicts: kept both auto-test-targets entries in the selftests Makefile,
where each side added one after dequeue_iter.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions