diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-04-02 15:03:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-04-02 15:04:09 +0200 |
| commit | 9853914c08e00d2ccbffbceaaada5ad7c6e4db4c (patch) | |
| tree | 2e01e853871112c32a9cc446479459f1ecb9948d /Makefile | |
| parent | 265439eb88fda0bf77821e10aafed22cdd450f9d (diff) | |
| parent | e08d007f9d813616ce7093600bc4fdb9c9d81d89 (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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2,7 +2,7 @@ VERSION = 7 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -rc4 +EXTRAVERSION = -rc6 NAME = Baby Opossum Posse # *DOCUMENTATION* @@ -1654,7 +1654,7 @@ CLEAN_FILES += vmlinux.symvers modules-only.symvers \ modules.builtin.ranges vmlinux.o.map vmlinux.unstripped \ compile_commands.json rust/test \ rust-project.json .vmlinux.objs .vmlinux.export.c \ - .builtin-dtbs-list .builtin-dtb.S + .builtin-dtbs-list .builtin-dtbs.S # Directories & files removed with 'make mrproper' MRPROPER_FILES += include/config include/generated \ |