Re: linux-next: manual merge of the bpf-next tree with the kbuild tree

[Mark Brown]

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@xxxxxxxxxxxxx/

> 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: signature.asc
Description: PGP signature