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

 Conflicts:
	kernel/sched/ext.c

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

diff --cc kernel/sched/ext.c
index a448a8407d8e04cf2eaddd201c6b4a2faad84eb9,1594987d637b09e586ae788b7f2e6336332d605a..7278d574964783194d97e6cb1042e97a3db51c61
--- 1/kernel/sched/ext.c
--- 2/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.