Subject: Re: linux-next: manual merge of the kbuild tree with Lnus' tree

From: Nathan Chancellor <[email-masked]>
Date: Mon, 8 Sep 2025 08:34:32 -0700

Hi Stephen,

On Mon, Sep 08, 2025 at 01:49:13PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the kbuild tree got a conflict in:
> 
>   arch/riscv/Kconfig
> 
> between commit:
> 
>   41f9049cff32 ("riscv: Only allow LTO with CMODEL_MEDANY")
> 
> from Lnus' tree and commit:
> 
>   6578a1ff6aa4 ("riscv: Remove version check for LTO_CLANG selects")
> 
> from the kbuild tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.

Yes, this looks correct to me, thanks! I will make sure to mention it to
Linus if I do not need to backmerge his tree before the 6.18 Kbuild pull
request.

> This is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc arch/riscv/Kconfig
> index 51dcd8eaa243,850ba4b4b534..000000000000
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@@ -64,9 -64,8 +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
> - 	# 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
> ++	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