diff options
| author | Tejun Heo <tj@kernel.org> | 2026-03-07 04:57:53 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-03-07 04:57:53 -1000 |
| commit | f68971bcec23c53979531aab0904afec9b8d0b4a (patch) | |
| tree | ea8cfc7cb10bfa8f4e0a623eec31b5fc51a61e8d /tools/perf/scripts/python/stackcollapse.py | |
| parent | 4f8b122848dbc353a193de0fa707bc40b5f067ff (diff) | |
| parent | 57ccf5ccdc56954f2a91a7f66684fd31c566bde5 (diff) | |
Merge branch 'for-7.0-fixes' into for-7.1
Pull in 57ccf5ccdc56 ("sched_ext: Fix enqueue_task_scx() truncation of
upper enqueue flags") which conflicts with ebf1ccff79c4 ("sched_ext: Fix
ops.dequeue() semantics").
Signed-off-by: Tejun Heo <tj@kernel.org>
# Conflicts:
# kernel/sched/ext.c
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions