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

[Nathan Chancellor]

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@xxxxxxxxxxxxx/.
Restore it and the resolution should be correct with no build errors.

-- 
Cheers,
Nathan