Merge branch 'for-7.1-fixes' into for-7.2

Pull to receive:

 9a415cc537 ("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>
This commit is contained in:
Tejun Heo 2026-05-11 12:43:39 -10:00
commit fbce803562
2 changed files with 25 additions and 1 deletions