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

[Nathan Chancellor <nathan@kernel.org>]

On Mon, Oct 05, 2026 at 12:31:22PM +0200, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the kbuild tree got a conflict in:
> 
>   scripts/remove-stale-files
> 
> between commit:
> 
>   a41ec2936d2fe ("rust: doctest: generate Rust kunit test suites")
> 
> from the rust tree and commit:
> 
>   33bef82263082 ("kbuild: Move gen_init_cpio and gen_initramfs.sh to scripts/")
> 
> from the kbuild tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc scripts/remove-stale-files
> index f1f776caae00a,e46337e4bfb8f..0000000000000
> --- a/scripts/remove-stale-files
> +++ b/scripts/remove-stale-files
> @@@ -27,4 -27,4 +27,6 @@@ rm -f *.spe
>   
>   rm -f lib/test_fortify.log
>   
>  +rm -f rust/doctests_kernel_generated_kunit.c
> ++
> + rm -f usr/gen_init_cpio

Thanks, looks good to me.

-- 
Cheers,
Nathan