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>

diff --cc kernel/sched/ext.c
index 87146f6e2385a63b290e00e2d7b0ed8c785d782e,9354da79e162a73e15d60bbac4a6d28235b34fd5..64f8a096f133278beb651ccac299a6c8df49b8aa
--- 1/kernel/sched/ext.c
--- 2/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@@ -7205,7 -6972,7 +7222,6 @@@ static void scx_root_enable_workfn(stru
                if (unlikely(ret)) {
                        if (scx_get_task_state(p) != SCX_TASK_DEAD)
                                scx_set_task_state(p, SCX_TASK_NONE);
-                       put_task_struct(p);
 -                      task_rq_unlock(rq, p, &rf);
                        scx_task_iter_stop(&sti);
                        scx_error(sch, "ops.init_task() failed (%d) for %s[%d]",
                                  ret, p->comm, p->pid);