All of lore.kernel.org
 help / color / mirror / Atom feed
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: Thu, 1 Oct 2026 21:27:31 +0200	[thread overview]
Message-ID: <20261001192731.GA713751@ax162> (raw)
In-Reply-To: <ar5-4Yq3wtmXTWnD@sirena.org.uk>

Hi Mark,

On Thu, Oct 01, 2026 at 04:40:17PM +0100, Mark Brown wrote:
> Today's linux-next merge of the random tree got a conflict in:
> 
>   init/Kconfig
> 
> between commit:
> 
>   f85147b291e35 ("kbuild: move the toolchain checks into scripts/Kconfig.toolchain")
> 
> from the kbuild tree and commit:
> 
>   56ff95ee85715 ("random: vDSO: avoid call to memset() when zeroing reserved parameter")
> 
> from the random tree.

Thanks, I knew this was coming and the resolution almost looks correct
but...

> diff --cc init/Kconfig
> index ecd71b38fc560,98d8d7fa64c5c..0000000000000
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@@ -1,7 -1,207 +1,5 @@@
...
>  -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.

-- 
Cheers,
Nathan

  reply	other threads:[~2026-10-01 19:27 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-01 15:40 linux-next: manual merge of the random tree with the kbuild tree Mark Brown
2026-10-01 19:27 ` Nathan Chancellor [this message]
2026-10-01 21:13   ` Mark Brown
2026-10-02 16:24     ` Nathan Chancellor

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=20261001192731.GA713751@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.