diff options
| author | Tejun Heo <tj@kernel.org> | 2026-10-17 12:08:31 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-10-17 12:08:31 -1000 |
| commit | 9c0af54cb49ce84d05ff40dfc7c8b6daa4450809 (patch) | |
| tree | a5fd69e74ef1b874eeca7f71769864224ecf3ab7 /tools/perf/scripts/python | |
| parent | db87a8f530b62d43033ff41172d479d2ccd6fee3 (diff) | |
| parent | 680edc7f23ad71e0ecce8a2364af3ae7f30dd11a (diff) | |
sched_ext: Merge branch 'for-7.3-fixes' into for-7.4
Pull to receive 680edc7f23ad ("sched_ext: Don't queue balance callbacks from
a core-sched pick") and resolve its conflict with the proxy execution work
here so that for-next merges clean.
Conflicts:
- do_pick_task_scx(): 680edc7f23ad samples sched_core_enabled() into a new
local next to the prev declaration, which 3d6577ea93c9 ("sched_ext: Split
curr|donor references properly") changed to rq->donor. Kept rq->donor and
added the local.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions