Re: linux-next: manual merge of the efi tree with the kbuild tree

[Nathan Chancellor]

On Fri, Oct 09, 2026 at 11:41:41PM +0200, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the efi tree got a conflict in:
> 
>   drivers/firmware/efi/libstub/Makefile
> 
> between commit:
> 
>   454e00cf8ee5a ("kbuild: avoid re-running compiler and linker probes")
> 
> from the kbuild tree and commit:
> 
>   aa712d73350dc ("efi/libstub: Disable kernel stack erasing in the common flags")
> 
> from the efi tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. 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.
> 
> diff --cc drivers/firmware/efi/libstub/Makefile
> index 415f63105b481,7bb5e5066c732..0000000000000
> --- a/drivers/firmware/efi/libstub/Makefile
> +++ b/drivers/firmware/efi/libstub/Makefile
> @@@ -40,7 -40,8 +40,8 @@@ KBUILD_CFLAGS			:= $(subst $(CC_FLAGS_F
>   				   -D__NO_FORTIFY \
>   				   -ffreestanding \
>   				   -fno-stack-protector \
>  +				   $(CONFIG_CC_OPT_NO_ADDRSIG) \
> + 				   $(DISABLE_KSTACK_ERASE) \
>  -				   $(call cc-option,-fno-addrsig) \
>   				   -D__DISABLE_EXPORTS
>   
>   #

Thanks, looks good to me.

-- 
Cheers,
Nathan