mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-05-09 21:42:09 +02:00
9853914c08
The following fix in sched/urgent:e08d007f9d("sched/debug: Fix avg_vruntime() usage") is in conflict with this pending commit in sched/core:4823725d9d("sched/fair: Increase weight bits for avg_vruntime") Both modify the same variable definition and initialization blocks, resolve it by merging the two. Conflicts: kernel/sched/debug.c Signed-off-by: Ingo Molnar <mingo@kernel.org>