From: Mark Brown <broonie@kernel.org>
To: Nathan Chancellor <nathan@kernel.org>
Cc: "Andrew Morton" <akpm@linux-foundation.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>
Subject: Re: linux-next: manual merge of the kbuild tree with the mm-nonmm-unstable tree
Date: Mon, 5 Oct 2026 15:19:56 +0200 [thread overview]
Message-ID: <asOj_J9GELQiip9b@sirena.org.uk> (raw)
In-Reply-To: <20261005131417.GA1097851@ax162>
[-- Attachment #1: Type: text/plain, Size: 491 bytes --]
On Mon, Oct 05, 2026 at 03:14:17PM +0200, Nathan Chancellor wrote:
> 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?
Yeah, I was confused about what git was complaining about with this one
too.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2026-10-05 13:20 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
2026-10-05 13:14 ` Nathan Chancellor
2026-10-05 13:19 ` Mark Brown [this message]
-- 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=asOj_J9GELQiip9b@sirena.org.uk \
--to=broonie@kernel.org \
--cc=akpm@linux-foundation.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®