Re: linux-next: manual merge of the kbuild tree with the mm-nonmm-unstable tree

[Nathan Chancellor]

On Mon, Oct 05, 2026 at 06:07:13AM -0700, Andrew Morton wrote:
> On Mon, 5 Oct 2026 12:31:18 +0200 Mark Brown <broonie@xxxxxxxxxx> wrote:
> 
> > Hi all,
> > 
> > Today's linux-next merge of the kbuild tree got a conflict in:
> > 
> >   init/Kconfig
> > 
> > between commits:
> > 
> >   d514d23689356 ("init/Kconfig: make config INIT_ENV_ARG_LIMIT user-configurable")
> >   9998f5eea1407 ("init, arch: make CONFIG_COMMAND_LINE_SIZE globally configurable")
> > 
> > from the mm-nonmm-unstable tree and commit:
> > 
> >   f85147b291e35 ("kbuild: move the toolchain checks into scripts/Kconfig.toolchain")
> > 
> > from the kbuild 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
> 
> Thanks.
> 
> > diff --combined init/Kconfig
> > index 914c4c3ed7ee4,352601b44b5ca..0000000000000
> > ...
> > [250+ lines of diff]
> >
> 
> yikes.  I think I'll disable Wilson's command-line patches until after
> kbuild has merged up.
> 
> After kbuild is upstream I'll take a look at resurrecting command-line
> patches for a late merge-window thing or I'll bump them into 7.4-rcX. 
> Probably the former.
> 
> kbuilders: please try to merge early!

I plan to submit my pull request for 7.4 between 7.3-rc7 and 7.3 final.

That said, I fail to see where the conflict comes from between these
changes. They don't touch the same area in init/Kconfig. If I pull
mm-nonmm-unstable into kbuild-for-next, I don't get a conflict in
init/Kconfig at all, I only get the one in scripts/kallsyms.c that was
mentioned in another thread. Is something else going on here?

-- 
Cheers,
Nathan