From: Tejun Heo <tj@kernel.org>
Date: Sat, 25 Apr 2026 00:37:32 +0000 (-1000)
Subject: Merge branch 'for-7.1-fixes' into for-7.2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfe454e37b1ef58136ae3ce5019325d274296253;p=thirdparty%2Fkernel%2Flinux.git

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>
---

dfe454e37b1ef58136ae3ce5019325d274296253
diff --cc kernel/sched/ext.c
index 0ba12449f0c68,9eda20e5fdb8a..f7b1b16e81a57
--- a/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 (ops->flags & SCX_OPS_TID_TO_TASK) {
 +		ret = rhashtable_init(&scx_tid_hash, &scx_tid_hash_params);
 +		if (ret)
 +			goto err_free_ksyncs;
 +	}
 +
- #if defined(CONFIG_EXT_GROUP_SCHED) || defined(CONFIG_EXT_SUB_SCHED)
+ #ifdef CONFIG_EXT_SUB_SCHED
  	cgroup_get(cgrp);
  #endif
  	sch = scx_alloc_and_add_sched(ops, cgrp, NULL);