diff options
| author | Tejun Heo <tj@kernel.org> | 2025-03-03 08:02:22 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-03-03 08:02:22 -1000 |
| commit | 8a9b1585e2bf2a4d335774c893f5e80cf9262b6d (patch) | |
| tree | e3060de9a1fbf406d8f4caf27ca54d431910d7e2 /tools/perf/scripts/python/task-analyzer.py | |
| parent | 0f0714a3449ca43671c6aa4cae852c4dfceef0d0 (diff) | |
| parent | 9360dfe4cbd62ff1eb8217b815964931523b75b3 (diff) | |
sched_ext: Merge branch 'for-6.14-fixes' into for-6.15
Pull for-6.14-fixes to receive:
9360dfe4cbd6 ("sched_ext: Validate prev_cpu in scx_bpf_select_cpu_dfl()")
which conflicts with:
337d1b354a29 ("sched_ext: Move built-in idle CPU selection policy to a separate file")
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/task-analyzer.py')
0 files changed, 0 insertions, 0 deletions