From: Tejun Heo <tj@kernel.org>
Date: Tue, 29 Apr 2025 18:24:58 +0000 (-1000)
Subject: Merge branch 'for-6.15-fixes' into for-6.16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ce565f839c9e1c0952588f2b17ed4b02650f94b0;p=users%2Fwilly%2Fxarray.git

Merge branch 'for-6.15-fixes' into for-6.16

To receive e38be1c7647c ("sched_ext: Fix rq lock state in hotplug ops") to
avoid conflicts with scx_sched related patches pending for for-6.16.
---

ce565f839c9e1c0952588f2b17ed4b02650f94b0
diff --cc kernel/sched/ext.c
index 6e530a91e944,4e37b40ce280..59b49b3a3bbb
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@@ -3491,13 -3477,13 +3491,13 @@@ static void handle_hotplug(struct rq *r
  		scx_idle_update_selcpu_topology(&scx_ops);
  
  	if (online && SCX_HAS_OP(cpu_online))
- 		SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_online, rq, cpu);
+ 		SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_online, NULL, cpu);
  	else if (!online && SCX_HAS_OP(cpu_offline))
- 		SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_offline, rq, cpu);
+ 		SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_offline, NULL, cpu);
  	else
 -		scx_ops_exit(SCX_ECODE_ACT_RESTART | SCX_ECODE_RSN_HOTPLUG,
 -			     "cpu %d going %s, exiting scheduler", cpu,
 -			     online ? "online" : "offline");
 +		scx_exit(SCX_ECODE_ACT_RESTART | SCX_ECODE_RSN_HOTPLUG,
 +			 "cpu %d going %s, exiting scheduler", cpu,
 +			 online ? "online" : "offline");
  }
  
  void scx_rq_activate(struct rq *rq)