]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge branch 'for-7.0-fixes' into for-7.1
authorTejun Heo <tj@kernel.org>
Mon, 30 Mar 2026 18:52:33 +0000 (08:52 -1000)
committerTejun Heo <tj@kernel.org>
Mon, 30 Mar 2026 19:02:05 +0000 (09:02 -1000)
commit94555ca6d0bb41a7cb3c12ad2a7cacb6fdbdca0b
tree6c614260e1eb81b2f9fefb4a1a76ddcb0200b300
parent238aa43f0b77ea7db7f306e010f688c77439ee62
parent090d34f0f0285124452373225bcc520a31e305e4
Merge branch 'for-7.0-fixes' into for-7.1

Conflict in kernel/sched/ext.c init_sched_ext_class() between:

  415cb193bb97 ("sched_ext: Fix SCX_KICK_WAIT deadlock by deferring wait
  to balance callback")

which adds cpus_to_sync cpumask allocation, and:

  84b1a0ea0b7c ("sched_ext: Implement scx_bpf_dsq_reenq() for user DSQs")
  8c1b9453fde6 ("sched_ext: Convert deferred_reenq_locals from llist to
  regular list")

which add deferred_reenq init code at the same location. Both are
independent additions. Include both.

Signed-off-by: Tejun Heo <tj@kernel.org>
kernel/sched/ext.c
kernel/sched/ext_idle.c
kernel/sched/sched.h
tools/testing/selftests/sched_ext/Makefile