diff options
| author | Tejun Heo <tj@kernel.org> | 2026-03-09 09:59:36 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-03-09 09:59:36 -1000 |
| commit | 0e7cd9cef61fde36ebfb653fe9e7a9722185cb57 (patch) | |
| tree | 0eef127fa5f0bda6d0729a47ce5d3038c849b695 /tools/perf/scripts/python/bin/stackcollapse-record | |
| parent | bec10581e92289bdc3eed17e90200900ddb00594 (diff) | |
| parent | 54a66e431eeacf23e1dc47cb3507f2d0c068aaf0 (diff) | |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-7.1
Pull sched/core to resolve conflicts between:
c2a57380df9dd ("sched: Replace use of system_unbound_wq with system_dfl_wq")
from the tip tree and commit:
cde94c032b32b ("sched_ext: Make watchdog sub-sched aware")
The latter moves around code modiefied by the former. Apply the changes in
the new locations.
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