diff options
| author | Tejun Heo <tj@kernel.org> | 2026-09-01 21:06:23 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-09-02 07:41:01 -1000 |
| commit | ebe36c3942353d8b1b896495ec98e0bbed65c256 (patch) | |
| tree | 47c8c74433dcc1f68fa31b0b290cce6a537575f7 /scripts/Makefile.thinlto | |
| parent | bf2f23dc5a36237c0d4738966829e5cbde973c8a (diff) | |
| parent | 29871903f3a38e75e896f9a644713859490cb85f (diff) | |
| download | linux-next-ebe36c3942353d8b1b896495ec98e0bbed65c256.tar.gz linux-next-ebe36c3942353d8b1b896495ec98e0bbed65c256.zip | |
Merge branch 'for-7.3-fixes' into for-next
Semantic conflict in kernel/sched/ext/ext.c (scx_group_set_idle()) between:
29871903f3a3 ("sched_ext: Don't deliver duplicate ops.cgroup_set_idle() for same value")
and:
14eba6d98cab ("sched_ext: Rename tg->scx.idle to tg->scx.sched_idle")
on for-7.4. The former adds a tg->scx.idle comparison and the latter
renames the field, so the merge applies cleanly but doesn't build.
Resolved by switching the new comparison to tg->scx.sched_idle.
Diffstat (limited to 'scripts/Makefile.thinlto')
0 files changed, 0 insertions, 0 deletions