From: Andrew Morton <akpm@linux-foundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: "Nathan Chancellor" <nathan@kernel.org>,
"Nicolas Schier" <nsc@kernel.org>,
"KBuild Mailing List" <linux-kbuild@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Lorenzo Stoakes" <ljs@kernel.org>,
"Maciej Żenczykowski" <maze@google.com>,
"Wilson Felipe Pereira" <wfelipe@google.com>,
"Wilson Felipe Pereira" <wfelipe@google.com>
Subject: Re: linux-next: manual merge of the kbuild tree with the mm-nonmm-unstable tree
Date: Mon, 5 Oct 2026 06:07:13 -0700 [thread overview]
Message-ID: <20261005060713.afde74805e607478d6bda2ea@linux-foundation.org> (raw)
In-Reply-To: <asN8duP-cEdNqP5I@sirena.co.uk>
On Mon, 5 Oct 2026 12:31:18 +0200 Mark Brown <broonie@kernel.org> 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!
next prev parent reply other threads:[~2026-10-05 13:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-05 10:31 Mark Brown
2026-10-05 13:07 ` Andrew Morton [this message]
2026-10-05 13:14 ` Nathan Chancellor
2026-10-05 13:19 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2026-09-30 11:47 Mark Brown
2026-09-30 12:23 ` Lorenzo Stoakes (ARM)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261005060713.afde74805e607478d6bda2ea@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ljs@kernel.org \
--cc=maze@google.com \
--cc=nathan@kernel.org \
--cc=nsc@kernel.org \
--cc=wfelipe@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®