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

Pull to receive:

 c0e8ddc76d54 ("sched_ext: Align cgroup #ifdef guards with SUB_SCHED vs GROUP_SCHED")

which conflicts with:

 41e3312861ea ("sched_ext: add p->scx.tid and SCX_OPS_TID_TO_TASK lookup")

It's a simple context conflict. Take changes from both.

Signed-off-by: Tejun Heo <tj@kernel.org>

diff --cc kernel/sched/ext.c
index 0ba12449f0c68a47d5233f1ae52df1ce64bc0d76,9eda20e5fdb8a3c55a31a24e5e612fba494fd945..f7b1b16e81a573c697946dedb8bc9d157ed3707b
--- 1/kernel/sched/ext.c
--- 2/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@@ -5786,10 -5764,10 +5852,12 @@@ static void scx_sub_disable(struct scx_
                            &sub_detach_args);
        }
  
 +      scx_log_sched_disable(sch);
 +
        if (sch->ops.exit)
                SCX_CALL_OP(sch, exit, NULL, sch->exit_info);
+       if (sch->sub_kset)
+               kset_unregister(sch->sub_kset);
        kobject_del(&sch->kobj);
  }
  #else /* CONFIG_EXT_SUB_SCHED */
@@@ -6695,13 -6698,7 +6790,13 @@@ static void scx_root_enable_workfn(stru
        if (ret)
                goto err_unlock;
  
- #if defined(CONFIG_EXT_GROUP_SCHED) || defined(CONFIG_EXT_SUB_SCHED)
 +      if (ops->flags & SCX_OPS_TID_TO_TASK) {
 +              ret = rhashtable_init(&scx_tid_hash, &scx_tid_hash_params);
 +              if (ret)
 +                      goto err_free_ksyncs;
 +      }
 +
+ #ifdef CONFIG_EXT_SUB_SCHED
        cgroup_get(cgrp);
  #endif
        sch = scx_alloc_and_add_sched(ops, cgrp, NULL);

diff --cc kernel/sched/ext_internal.h
Simple merge