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

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1511 bytes --]

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'
  
  $(obj)/main.o: $(obj)/ksize.h

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

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@kernel.org> 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

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

[Nathan Chancellor]

On Wed, Oct 21, 2026 at 04:40:22PM +0200, Magnus Lindholm wrote:
> On Wed, Oct 21, 2026 at 1:01 PM Mark Brown <broonie@kernel.org> 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.

Thank you for the heads up, I have let Linus know about this one since
it is a little tricky.

  https://lore.kernel.org/20261021184723.GA2608581@ax162/

> 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.

Correct, thank you for catching this.

> Maybe adjust the resolution accordingly?

Since the conflict came from Linus's tree, I have resolved this in
kbuild-fixes-for-next so that Mark does not have to worry about this:

  https://git.kernel.org/kbuild/c/83deedcf85af511dc120b3cd8ee597d211cdf2fb

On a related note, is your tree flowing into -next? The recent
pull requests for alpha have come from your lindholm/alpha tree but
Next/Trees shows Matt's mattst88/alpha. Should that be changed? It would
not have saved much here since I send my pull request to Linus before
c437950dceb88 was applied in your tree as far as I can tell but it is
always good to catch these things early.

-- 
Cheers,
Nathan

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

[Magnus Lindholm]

Hi Nathan,

On Wed, Oct 21, 2026 at 8:59 PM Nathan Chancellor <nathan@kernel.org> wrote:
>
> On Wed, Oct 21, 2026 at 04:40:22PM +0200, Magnus Lindholm wrote:
> > On Wed, Oct 21, 2026 at 1:01 PM Mark Brown <broonie@kernel.org> 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.
>
> Thank you for the heads up, I have let Linus know about this one since
> it is a little tricky.
>
>   https://lore.kernel.org/20261021184723.GA2608581@ax162/
>
> > 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.
>
> Correct, thank you for catching this.
>
> > Maybe adjust the resolution accordingly?
>
> Since the conflict came from Linus's tree, I have resolved this in
> kbuild-fixes-for-next so that Mark does not have to worry about this:
>
>   https://git.kernel.org/kbuild/c/83deedcf85af511dc120b3cd8ee597d211cdf2fb
>

Thanks so much for handling this.

> On a related note, is your tree flowing into -next? The recent
> pull requests for alpha have come from your lindholm/alpha tree but
> Next/Trees shows Matt's mattst88/alpha. Should that be changed? It would
> not have saved much here since I send my pull request to Linus before
> c437950dceb88 was applied in your tree as far as I can tell but it is
> always good to catch these things early.
>

You are absolutely right, I'll wire up my lindholm/alpha tree into -next before
the next merge window.

Thanks again,

Magnus