From: Mark Brown <broonie@kernel.org>
To: Nathan Chancellor <nathan@kernel.org>
Cc: Kumar Kartikeya Dwivedi <memxor@gmail.com>,
Eduard Zingerman <eddyz87@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>, bpf <bpf@vger.kernel.org>,
Networking <netdev@vger.kernel.org>,
"Jason A. Donenfeld" <Jason@zx2c4.com>,
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>, Nicolas Schier <nsc@kernel.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the kbuild tree
Date: Sat, 3 Oct 2026 01:11:49 +0200 [thread overview]
Message-ID: <asA6NZ4QKp4k4nGD@sirena.co.uk> (raw)
In-Reply-To: <20261002230632.GA314599@ax162>
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]
On Sat, Oct 03, 2026 at 01:06:32AM +0200, Nathan Chancellor wrote:
> On Sat, Oct 03, 2026 at 12:42:58AM +0200, Mark Brown wrote:
> > 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.
> Thanks, the 'source' line looks correct to me now. Did you also shuffle
> CC_OPT_INLINE_MEMSET into scripts/Kconfig.toolchain like below? You had
> it right in
> https://lore.kernel.org/ar5-4Yq3wtmXTWnD@sirena.org.uk/
> but the patch changed slightly since that resolution ('4294967295' to
> '4294967294') due to a problem I reported
That will be delayed for today since the scripting has got confused by
me moving machines in the middle of running the merge but it has gone in
later in the merge so it should be there in the final tree, and
hopefully in the right place next time I run -next (due to LPC/MS it'll
be spotty at best this week, I and everyone likely to provide backup are
all in Prauge).
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2026-10-02 23:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-02 22:42 Mark Brown
2026-10-02 23:06 ` Nathan Chancellor
2026-10-02 23:11 ` Mark Brown [this message]
2026-10-03 6:43 ` Alexei Starovoitov
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=asA6NZ4QKp4k4nGD@sirena.co.uk \
--to=broonie@kernel.org \
--cc=Jason@zx2c4.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ljs@kernel.org \
--cc=memxor@gmail.com \
--cc=nathan@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nsc@kernel.org \
/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®