]> git.ipfire.org Git - thirdparty/linux.git/commit
projects / thirdparty / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9740914 9a415cc)
Merge branch 'for-7.1-fixes' into for-7.2
authorTejun Heo <tj@kernel.org>
Mon, 11 May 2026 22:43:39 +0000 (12:43 -1000)
committerTejun Heo <tj@kernel.org>
Mon, 11 May 2026 22:43:39 +0000 (12:43 -1000)
commitfbce803562169a9735d9d3aa9a15ea28d99f977d
treeed96a4076f5003c36fa719391e2478d5d47e39bbtree | snapshot
parent9740914d36e5ab4f22ab215e68ee8ab0b5771e8ecommit | diff
parent9a415cc53711f2238e0f0ca8a6bcc796c003b127commit | diff
Merge branch 'for-7.1-fixes' into for-7.2

Pull to receive:

 9a415cc53711 ("sched_ext: Avoid UAF in scx_root_enable_workfn() init failure path")

Conflicts with for-7.2's scx_task_iter_relock() rework. The fix moves
put_task_struct(p) past scx_error(); for-7.2 still has it at the old
position. Resolved by dropping the old one.

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