]> Git Repo - linux.git/commit
Merge branch 'linus' into sched/urgent, to resolve conflict
authorIngo Molnar <[email protected]>
Thu, 17 Oct 2024 07:58:07 +0000 (09:58 +0200)
committerIngo Molnar <[email protected]>
Thu, 17 Oct 2024 07:58:07 +0000 (09:58 +0200)
commitbe602cde657ee43d23adbf309be6d700d0106dc9
treed27775738d0deefe7c3071be7d667912dc3ee932
parentcd9626e9ebc77edec33023fe95dab4b04ffc819d
parentc964ced7726294d40913f2127c3f185a92cb4a41
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 <[email protected]>
include/linux/sched.h
kernel/sched/core.c
kernel/sched/ext.c
kernel/sched/sched.h
This page took 0.057833 seconds and 4 git commands to generate.