From: Nathan Chancellor <nathan@kernel•org>
To: Mark Brown <broonie@kernel•org>
Cc: Nicolas Schier <nsc@kernel•org>,
KBuild Mailing List <linux-kbuild@vger•kernel.org>,
Andrew Morton <akpm@linux-foundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Petr Pavlu <petr.pavlu@suse•com>, Sasha Levin <sashal@kernel•org>
Subject: Re: linux-next: manual merge of the kbuild tree with the origin tree
Date: Mon, 18 May 2026 12:28:08 -0700 [thread overview]
Message-ID: <20260518192808.GA2884150@ax162> (raw)
In-Reply-To: <20260518191337.GB2318678@ax162>
On Mon, May 18, 2026 at 12:13:37PM -0700, Nathan Chancellor wrote:
> Hi Mark,
>
> On Mon, May 18, 2026 at 05:11:02PM +0100, Mark Brown wrote:
> > Today's linux-next merge of the kbuild tree got a conflict in:
> >
> > scripts/Makefile.modfinal
> >
> > between commit:
> >
> > dc1f85a9637cc ("kallsyms: extend lineinfo to loadable modules")
> >
> > from the origin tree and commit:
> >
> > 7abef41afad05 ("kbuild/btf: Remove broken module relinking exclusion")
> >
> > from the kbuild tree.
>
> Thanks for the heads up! The resolution looks correct to me but
> dc1f85a9637cc does not appear to be in Linus's tree? I would have
> expected the Kbuild tree to have it if so since it is based on 7.1-rc1.
>
> $ git describe --contains dc1f85a9637ccd3d171fb5262fd38919dfe632bb
> Could not get object for dc1f85a9637ccd3d171fb5262fd38919dfe632bb. Skipping.
>
> It looks like it is in one of Andrew's trees? I just want to make sure
> for my notes to Linus.
Hmmm, it looks like Andrew actually dropped this series a few weeks ago,
as Sasha sent a new version:
https://lore.kernel.org/20260427171749.9068CC2BCB4@smtp.kernel.org/
https://lore.kernel.org/20260504153401.2416391-3-sashal@kernel.org/
Is this because you used an old version of the mm tree?
https://lore.kernel.org/fabba1ab-ceff-429c-af55-92844b179890@sirena.org.uk/
Not that the conflict won't come back with the new version, I just want
to make sure I have my ducks in a row.
--
Cheers,
Nathan
next prev parent reply other threads:[~2026-05-18 19:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-18 16:11 linux-next: manual merge of the kbuild tree with the origin tree Mark Brown
2026-05-18 19:13 ` Nathan Chancellor
2026-05-18 19:28 ` Nathan Chancellor [this message]
2026-05-18 19:55 ` Andrew Morton
2026-05-19 7:37 ` Mark Brown
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=20260518192808.GA2884150@ax162 \
--to=nathan@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kbuild@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nsc@kernel$(echo .)org \
--cc=petr.pavlu@suse$(echo .)com \
--cc=sashal@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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