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 /init | |
| 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 'init')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 444ce811ea67..7484cd703bc1 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -146,7 +146,7 @@ config CC_HAS_COUNTED_BY config CC_HAS_COUNTED_BY_PTR bool # supported since clang 22 - default y if CC_IS_CLANG && CLANG_VERSION >= 220000 + default y if CC_IS_CLANG && CLANG_VERSION >= 220100 # supported since gcc 16.0.0 default y if CC_IS_GCC && GCC_VERSION >= 160000 |