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

[Nathan Chancellor]

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