diff options
| author |   Tejun Heo <tj@kernel.org> | 2026-04-03 07:48:28 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-04-03 07:48:28 -1000 |
| commit | 744ab12a5bd1a0dc59c5ba5354ae40030c834a46 (patch) | |
| tree | 5834bf4c459909446df2414d98d827c50afcc25e /include/linux/hsi/ssh:/git@git.zx2c4.com/git: | |
| parent | sched_ext: Fix missing warning in scx_set_task_state() default case (diff) | |
| parent | sched_ext: Fix stale direct dispatch state in ddsp_dsq_id (diff) | |
Merge branch 'for-7.0-fixes' into for-7.1
Conflict in kernel/sched/ext.c between:
7e0ffb72de8a ("sched_ext: Fix stale direct dispatch state in
ddsp_dsq_id")
which clears ddsp state at individual call sites instead of
dispatch_enqueue(), and sub-sched related code reorg and API updates on
for-7.1. Resolved by applying the ddsp fix with for-7.1's signatures.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/hsi/ssh:/git@git.zx2c4.com/git:')
0 files changed, 0 insertions, 0 deletions