diff options
| author | Tejun Heo <tj@kernel.org> | 2026-09-26 10:25:38 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-09-26 10:25:38 -1000 |
| commit | e3d53f83701eefa90cbb07f626da2beb91b67ec7 (patch) | |
| tree | fcfde867350ab7d9b022648099a7fa576facea8c /tools/perf/scripts/python | |
| parent | 5cadf7545cc6528cc41d9d8dac52faf331cbc878 (diff) | |
| parent | 94480606a677deb68d5622cf0ded88626514b3f2 (diff) | |
| download | linux-next-e3d53f83701eefa90cbb07f626da2beb91b67ec7.tar.gz linux-next-e3d53f83701eefa90cbb07f626da2beb91b67ec7.zip | |
sched_ext: Merge branch 'for-7.3-fixes' into for-7.4
Pull to receive 94480606a677 ("sched_ext: Add a size argument to
scx_bpf_cid_topo() so struct scx_cid_topo can grow") for the upcoming
cluster level.
Conflicts: kept both declarations where 5cadf7545cc6 ("sched_ext: Add a
CID NUMA node lookup kfunc") added one next to the changed
scx_bpf_cid_topo() line, and pointed 29871903f3a3 ("sched_ext: Don't
deliver duplicate ops.cgroup_set_idle() for same value") at the renamed
tg->scx.sched_idle.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions