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

[Magnus Lindholm]

Hi Mark,

On Wed, Oct 21, 2026 at 1:01 PM Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the kbuild-current tree got a conflict in:
>
>   arch/alpha/boot/Makefile
>
> between commit:
>
>   c437950dceb88 ("alpha: add self-extracting compressed kernel boot stub")
>
> from the origin tree and commit:
>
>   0d4d70da348b0 ("kbuild: Mark the gzip recipes as recursive")
>
> from the kbuild-current 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 arch/alpha/boot/Makefile
> index 7c2a41c1e2a06,b050753e90157..0000000000000
> --- a/arch/alpha/boot/Makefile
> +++ b/arch/alpha/boot/Makefile
> @@@ -39,14 -38,9 +39,14 @@@ ifdef INITR
>         cat $(INITRD) >> $@
>   endif
>
>  -# Compressed kernel image
>  -$(obj)/vmlinux.gz: $(obj)/vmlinux FORCE
>  -      +$(call if_changed,gzip)
>  +# Self-extracting compressed kernel image: a small ELF stub (see
>  +# compressed/) with the real vmlinux linked in compressed, which aboot
>  +# loads and enters like a plain vmlinux.
>  +$(obj)/compressed/vmlinux: vmlinux FORCE
>  +      $(Q)$(MAKE) $(build)=$(obj)/compressed $@
>  +
>  +$(obj)/vmlinuz: $(obj)/compressed/vmlinux FORCE
> -       $(call if_changed,copy)
> ++      +$(call if_changed,copy)
>         @echo '  Kernel $@ is ready'
>

Thanks for resolving this.

This recipe now only copies the completed image, so I think it
should stay without '+'. Matt's series moved compression into
arch/alpha/boot/compressed/Makefile, where the change should be:

 $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
- $(call if_changed,gzip)
+ +$(call if_changed,gzip)

The existing vmlinux.nh.gz gzip recipe in arch/alpha/boot/Makefile
still needs the '+' from the kbuild patch.

Maybe adjust the resolution accordingly?

Thanks,
Magnus

>   $(obj)/main.o: $(obj)/ksize.h