Merge branch 'linus' into sched/urgent, to resolve conflict

 Conflicts:
	kernel/sched/ext.c

There's a context conflict between this upstream commit:

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

... and this fix in sched/urgent:

  98442f0ccd82 sched: Fix delayed_dequeue vs switched_from_fair()

Resolve it.

Signed-off-by: Ingo Molnar <[email protected]>

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/ext.c
index 6f9de573ee93665a0162c82450b1734739b2f3e5,6eae3b69bf6e5dbbfed0189721841f7f37d8719f..5900b06fd0364c76bcca9a37e9ad9e76082b8560
--- 1/kernel/sched/ext.c
--- 2/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@@ -4470,8 -4493,7 +4493,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);
@@@ -5186,7 -5203,8 +5203,8 @@@ static int scx_ops_enable(struct sched_
  
                sched_deq_and_put_task(p, DEQUEUE_SAVE | DEQUEUE_MOVE, &ctx);
  
 -              __setscheduler_prio(p, p->prio);
+               p->scx.slice = SCX_SLICE_DFL;
 +              p->sched_class = __setscheduler_class(p, p->prio);
                check_class_changing(task_rq(p), p, old_class);
  
                sched_enq_and_set_task(&ctx);

diff --cc kernel/sched/sched.h
Simple merge