linux-next: manual merge of the sched-ext tree with the tip tree

[Mark Brown]

Hi all,

Today's linux-next merge of the sched-ext tree got a conflict in:

  kernel/sched/ext.c

between commit:

  c2a57380df9dd ("sched: Replace use of system_unbound_wq with system_dfl_wq")

from the tip tree and commit:

  3f27958b729a2 ("sched_ext: Use READ_ONCE() for plain reads of scx_watchdog_timeout")

from the sched-ext tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc kernel/sched/ext.c
index a448a8407d8e0,b9247c9f0430b..0000000000000
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@@ -2762,8 -2848,8 +2848,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 -5175,8 +5175,8 @@@ static int scx_enable(struct sched_ext_
  
  	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.

Attachment: signature.asc
Description: PGP signature