]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 265439e e08d007)
Merge branch 'sched/urgent' into sched/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Thu, 2 Apr 2026 13:03:51 +0000 (15:03 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 2 Apr 2026 13:04:09 +0000 (15:04 +0200)
commit9853914c08e00d2ccbffbceaaada5ad7c6e4db4c
tree2e01e853871112c32a9cc446479459f1ecb9948dtree | snapshot
parent265439eb88fda0bf77821e10aafed22cdd450f9dcommit | diff
parente08d007f9d813616ce7093600bc4fdb9c9d81d89commit | diff
Merge branch 'sched/urgent' into sched/core, to resolve conflicts

The following fix in sched/urgent:

  e08d007f9d81 ("sched/debug: Fix avg_vruntime() usage")

is in conflict with this pending commit in sched/core:

  4823725d9d1d ("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>
MAINTAINERS diff1 | diff2 | blob | history
kernel/sched/debug.c diff1 | diff2 | blob | history
kernel/sched/fair.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository