From: Tejun Heo <tj@kernel.org>
Date: Sat, 7 Mar 2026 14:57:53 +0000 (-1000)
Subject: Merge branch 'for-7.0-fixes' into for-7.1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f68971bcec23c53979531aab0904afec9b8d0b4a;p=thirdparty%2Flinux.git

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
---

f68971bcec23c53979531aab0904afec9b8d0b4a
diff --cc kernel/sched/ext.c
index e25b3593dd307,174e3650d7fec..72b7a87f66ec9
--- a/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