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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

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

  kernel/sched/idle.c

between commit:

  a110a81c52a9 ("sched/deadline: Deferrable dl server")

from the tip tree and commit:

  a7a9fc549293 ("sched_ext: Add boilerplate for extensible scheduler class")

from the sched-ext tree.

I fixed it up (I think, 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.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/sched/idle.c
index d560f7ffa463,c7a218123b7a..000000000000
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@@ -452,14 -452,14 +452,16 @@@ static void wakeup_preempt_idle(struct 
  
  static void put_prev_task_idle(struct rq *rq, struct task_struct *prev)
  {
 +	dl_server_update_idle_time(rq, prev);
+ 	scx_update_idle(rq, false);
  }
  
  static void set_next_task_idle(struct rq *rq, struct task_struct *next, bool first)
  {
  	update_idle_core(rq);
+ 	scx_update_idle(rq, true);
  	schedstat_inc(rq->sched_goidle);
 +	next->se.exec_start = rq_clock_task(rq);
  }
  
  #ifdef CONFIG_SMP

Attachment: pgpE0GKWew6Il.pgp
Description: OpenPGP digital signature