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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 15 Oct 2024 13:49:04 +1100

Hi all,

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

  kernel/sched/ext.c

between commit:

  98442f0ccd82 ("sched: Fix delayed_dequeue vs switched_from_fair()")

from the tip tree and commit:

  3fdb9ebcec10 ("sched_ext: Start schedulers with consistent p->scx.slice values")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/sched/ext.c
index 5c8453f6a5b5,281652d5df8b..000000000000
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@@ -4475,8 -4560,7 +4560,7 @@@ static void scx_ops_disable_workfn(stru
  
  		sched_deq_and_put_task(p, DEQUEUE_SAVE | DEQUEUE_MOVE, &ctx);
  
- 		p->scx.slice = min_t(u64, p->scx.slice, SCX_SLICE_DFL);
 -		__setscheduler_prio(p, p->prio);
 +		p->sched_class = __setscheduler_class(p, p->prio);
  		check_class_changing(task_rq(p), p, old_class);
  
  		sched_enq_and_set_task(&ctx);
@@@ -5192,7 -5270,8 +5270,8 @@@ static int scx_ops_enable(struct sched_
  
  		sched_deq_and_put_task(p, DEQUEUE_SAVE | DEQUEUE_MOVE, &ctx);
  
+ 		p->scx.slice = SCX_SLICE_DFL;
 -		__setscheduler_prio(p, p->prio);
 +		p->sched_class = __setscheduler_class(p, p->prio);
  		check_class_changing(task_rq(p), p, old_class);
  
  		sched_enq_and_set_task(&ctx);