Merge branch 'linus' into sched/urgent, to resolve conflict

Conflicts: kernel/sched/ext.c There's a context conflict between this upstream commit: 3fdb9ebcec10 sched_ext: Start schedulers with consistent p->scx.slice values ... and this fix in sched/urgent: 98442f0ccd82 sched: Fix delayed_dequeue vs switched_from_fair() Resolve it. Signed-off-by: Ingo Molnar <mingo@kernel.org>


Author Ingo Molnar Date Commit Parent cd9626e9
+11593 -8988
1588 changed files
+11593 -8988
1588 changed files