]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
sched_ext: Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel...
authorTejun Heo <tj@kernel.org>
Thu, 16 Oct 2025 18:45:38 +0000 (08:45 -1000)
committerTejun Heo <tj@kernel.org>
Thu, 16 Oct 2025 18:45:38 +0000 (08:45 -1000)
commit70d837c3e017a0dc2bc52abf07abfeebd006c946
tree76fa15469bcadd3f22847a217bceee8c3a0e967e
parent075e3f7206c44dd5c72bae8c617d1cffbfd7a033
parent73cbcfe255f7edca915d978a7d1b0a11f2d62812
sched_ext: Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-6.19

Pull in tip/sched/core to receive:

 50653216e4ff ("sched: Add support to pick functions to take rf")
 4c95380701f5 ("sched/ext: Fold balance_scx() into pick_task_scx()")

which will enable clean integration of DL server support among other things.

This conflicts with the following from sched_ext/for-6.18-fixes:

 a8ad873113d3 ("sched_ext: defer queue_balance_callback() until after ops.dispatch")

which adds maybe_queue_balance_callback() to balance_scx() which is removed
by 50653216e4ff. Resolve by moving the invocation to pick_task_scx() in the
equivalent location.

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