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

[Andrew Morton]

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!