mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-28 06:44:36 -05:00
Conflicts: kernel/sched/ext.c There's a context conflict between this upstream commit:3fdb9ebcecsched_ext: Start schedulers with consistent p->scx.slice values ... and this fix in sched/urgent:98442f0ccdsched: Fix delayed_dequeue vs switched_from_fair() Resolve it. Signed-off-by: Ingo Molnar <mingo@kernel.org>