]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4f8b122 57ccf5c)
Merge branch 'for-7.0-fixes' into for-7.1
authorTejun Heo <tj@kernel.org>
Sat, 7 Mar 2026 14:57:53 +0000 (04:57 -1000)
committerTejun Heo <tj@kernel.org>
Sat, 7 Mar 2026 14:57:53 +0000 (04:57 -1000)
commitf68971bcec23c53979531aab0904afec9b8d0b4a
treeea8cfc7cb10bfa8f4e0a623eec31b5fc51a61e8dtree | snapshot
parent4f8b122848dbc353a193de0fa707bc40b5f067ffcommit | diff
parent57ccf5ccdc56954f2a91a7f66684fd31c566bde5commit | diff
Merge branch 'for-7.0-fixes' into for-7.1

Pull in 57ccf5ccdc56 ("sched_ext: Fix enqueue_task_scx() truncation of
upper enqueue flags") which conflicts with ebf1ccff79c4 ("sched_ext: Fix
ops.dequeue() semantics").

Signed-off-by: Tejun Heo <tj@kernel.org>
# Conflicts:
# kernel/sched/ext.c
Documentation/scheduler/sched-ext.rst diff1 | diff2 | blob | history
kernel/sched/ext.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository