From: Nathan Chancellor <nathan@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Theodore Ts'o <tytso@mit.edu>,
"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 random tree with the kbuild tree
Date: Fri, 2 Oct 2026 18:24:22 +0200 [thread overview]
Message-ID: <20261002162422.GA288990@ax162> (raw)
In-Reply-To: <e7b1d231-f862-4f58-8cf2-3670066f8451@sirena.org.uk>
On Thu, Oct 01, 2026 at 10:13:03PM +0100, Mark Brown wrote:
> On Thu, Oct 01, 2026 at 09:27:31PM +0200, Nathan Chancellor wrote:
> > On Thu, Oct 01, 2026 at 04:40:17PM +0100, Mark Brown wrote:
>
> > > -config PAHOLE_VERSION
> > > - int
> > > - default "$(PAHOLE_VERSION)"
> > >
> > > - source "scripts/Kconfig.toolchain"
> > > -
>
> > You appear to have dropped this source line, which I believe is the root
> > cause of https://lore.kernel.org/ar5-8C-j_JT5OYQm@sirena.org.uk/.
> > Restore it and the resolution should be correct with no build errors.
>
> You're quite right, sorry - I got distracted by the complictated bit
> with having to update a non-conflicting file.
No worries at all, glad it was something simple in the end! Hopefully
there should be no more conflicts from that shuffle.
--
Cheers,
Nathan
prev parent reply other threads:[~2026-10-02 16:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-01 15:40 Mark Brown
2026-10-01 19:27 ` Nathan Chancellor
2026-10-01 21:13 ` Mark Brown
2026-10-02 16:24 ` Nathan Chancellor [this message]
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=20261002162422.GA288990@ax162 \
--to=nathan@kernel.org \
--cc=Jason@zx2c4.com \
--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=nsc@kernel.org \
--cc=tytso@mit.edu \
/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®