]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge 6.17-rc6 into kbuild-next
authorNathan Chancellor <nathan@kernel.org>
Fri, 19 Sep 2025 20:43:11 +0000 (13:43 -0700)
committerNathan Chancellor <nathan@kernel.org>
Fri, 19 Sep 2025 20:43:11 +0000 (13:43 -0700)
Commit bd7c2312128e ("pinctrl: meson: Fix typo in device table macro")
is needed in kbuild-next to avoid a build error with a future change.

While at it, address the conflict between commit 41f9049cff32 ("riscv:
Only allow LTO with CMODEL_MEDANY") and commit 6578a1ff6aa4 ("riscv:
Remove version check for LTO_CLANG selects"), as reported by Stephen
Rothwell [1].

Link: https://lore.kernel.org/20250908134913.68778b7b@canb.auug.org.au/
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1  2 
Makefile
arch/riscv/Kconfig

diff --cc Makefile
Simple merge
index 850ba4b4b534e68885a15f4259792e26688422bd,51dcd8eaa24356d947ebe0f1c4a701a3cfc6b757..9f17643178ca56e9930c8a8b77aae97877954b68
@@@ -64,8 -64,9 +64,8 @@@ config RISC
        select ARCH_SUPPORTS_DEBUG_PAGEALLOC if MMU
        select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE
        select ARCH_SUPPORTS_HUGETLBFS if MMU
-       select ARCH_SUPPORTS_LTO_CLANG
 -      # LLD >= 14: https://github.com/llvm/llvm-project/issues/50505
 -      select ARCH_SUPPORTS_LTO_CLANG if LLD_VERSION >= 140000 && CMODEL_MEDANY
 -      select ARCH_SUPPORTS_LTO_CLANG_THIN if LLD_VERSION >= 140000
++      select ARCH_SUPPORTS_LTO_CLANG if CMODEL_MEDANY
 +      select ARCH_SUPPORTS_LTO_CLANG_THIN
        select ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS if 64BIT && MMU
        select ARCH_SUPPORTS_PAGE_TABLE_CHECK if MMU
        select ARCH_SUPPORTS_PER_VMA_LOCK if MMU