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

[Nathan Chancellor]

On Wed, Oct 21, 2026 at 06:01:17PM +0200, Miguel Ojeda wrote:
> On Wed, Oct 21, 2026 at 3:57 PM Mark Brown <broonie@xxxxxxxxxx> wrote:
> >
> > Today's linux-next merge of the rust tree got a conflict in:
> >
> >   init/Kconfig
> >
> > between commit:
> >
> >   f85147b291e35 ("kbuild: move the toolchain checks into scripts/Kconfig.toolchain")
> >
> > from the kbuild-fixes tree and commit:
> >
> >   3504d1bce9920 ("rust: kunit: use `file!()` inside `kunit_assert!`")
> >
> > from the rust tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> 
> Seems fine, thanks!

Agreed. I let Linus know about this one at the same time as another
conflict.

-- 
Cheers,
Nathan