From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 6 Mar 2026 05:21:02 +0000 (+0100)
Subject: Merge branch 'linus' into sched/core, to resolve conflicts
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12f8069115d5ff9d292c6b00c74e1984b01b6fc1;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'linus' into sched/core, to resolve conflicts

 Conflicts:
	kernel/sched/ext.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

12f8069115d5ff9d292c6b00c74e1984b01b6fc1
diff --cc kernel/sched/ext.c
index a448a8407d8e0,1594987d637b0..7278d57496478
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@@ -2762,8 -2766,8 +2766,8 @@@ static void scx_watchdog_workfn(struct 
  
  		cond_resched();
  	}
 -	queue_delayed_work(system_unbound_wq, to_delayed_work(work),
 +	queue_delayed_work(system_dfl_wq, to_delayed_work(work),
- 			   scx_watchdog_timeout / 2);
+ 			   READ_ONCE(scx_watchdog_timeout) / 2);
  }
  
  void scx_tick(struct rq *rq)
@@@ -5059,8 -5088,8 +5088,8 @@@ static void scx_enable_workfn(struct kt
  
  	WRITE_ONCE(scx_watchdog_timeout, timeout);
  	WRITE_ONCE(scx_watchdog_timestamp, jiffies);
 -	queue_delayed_work(system_unbound_wq, &scx_watchdog_work,
 +	queue_delayed_work(system_dfl_wq, &scx_watchdog_work,
- 			   scx_watchdog_timeout / 2);
+ 			   READ_ONCE(scx_watchdog_timeout) / 2);
  
  	/*
  	 * Once __scx_enabled is set, %current can be switched to SCX anytime.