mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-17 09:35:10 -04:00
Conflict in kernel/sched/ext.c init_sched_ext_class() between:415cb193bb("sched_ext: Fix SCX_KICK_WAIT deadlock by deferring wait to balance callback") which adds cpus_to_sync cpumask allocation, and:84b1a0ea0b("sched_ext: Implement scx_bpf_dsq_reenq() for user DSQs")8c1b9453fd("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>