Merge branch 'for-7.0-fixes' into for-7.1

Pull in 57ccf5ccdc56 ("sched_ext: Fix enqueue_task_scx() truncation of
upper enqueue flags") which conflicts with ebf1ccff79c4 ("sched_ext: Fix
ops.dequeue() semantics").

Signed-off-by: Tejun Heo <tj@kernel.org>
# Conflicts:
#	kernel/sched/ext.c

diff --cc Documentation/scheduler/sched-ext.rst
Simple merge

diff --cc kernel/sched/ext.c
index e25b3593dd307065e57ebdbf2b66e76e052c9afd,174e3650d7fec5e6298c0ef5127ceb96b4b9b100..72b7a87f66ec9819653ecd5c288264fef4b0a000
--- 1/kernel/sched/ext.c
--- 2/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@@ -1728,16 -1470,18 +1728,15 @@@ static void clr_task_runnable(struct ta
                p->scx.flags |= SCX_TASK_RESET_RUNNABLE_AT;
  }
  
- static void enqueue_task_scx(struct rq *rq, struct task_struct *p, int enq_flags)
+ static void enqueue_task_scx(struct rq *rq, struct task_struct *p, int core_enq_flags)
  {
 -      struct scx_sched *sch = scx_root;
 +      struct scx_sched *sch = scx_task_sched(p);
        int sticky_cpu = p->scx.sticky_cpu;
+       u64 enq_flags = core_enq_flags | rq->scx.extra_enq_flags;
  
        if (enq_flags & ENQUEUE_WAKEUP)
                rq->scx.flags |= SCX_RQ_IN_WAKEUP;
  
-       enq_flags |= rq->scx.extra_enq_flags;
 -      if (sticky_cpu >= 0)
 -              p->scx.sticky_cpu = -1;
--
        /*
         * Restoring a running task will be immediately followed by
         * set_next_task_scx() which expects the task to not be on the BPF