]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b905ee7 7e0ffb7)
Merge branch 'for-7.0-fixes' into for-7.1
authorTejun Heo <tj@kernel.org>
Fri, 3 Apr 2026 17:48:28 +0000 (07:48 -1000)
committerTejun Heo <tj@kernel.org>
Fri, 3 Apr 2026 17:48:28 +0000 (07:48 -1000)
commit744ab12a5bd1a0dc59c5ba5354ae40030c834a46
tree5834bf4c459909446df2414d98d827c50afcc25etree | snapshot
parentb905ee77d5f557a83a485b4146210f54f13365fccommit | diff
parent7e0ffb72de8aa3b25989c2d980e81b829c577010commit | 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>
kernel/sched/ext.c diff1 | diff2 | blob | history
kernel/sched/ext_idle.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository