Skip to content
Commit be602cde authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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



 Conflicts:
	kernel/sched/ext.c

There's a context conflict between this upstream commit:

  3fdb9ebc sched_ext: Start schedulers with consistent p->scx.slice values

... and this fix in sched/urgent:

  98442f0c sched: Fix delayed_dequeue vs switched_from_fair()

Resolve it.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents cd9626e9 c964ced7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment