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

[Gary Guo]

On Mon Mar 30, 2026 at 2:17 PM BST, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   scripts/Makefile.build
>
> between commit:
>
>   f41941aab3acd ("rust: ptr: add projection infrastructure")

This commit is in v7.0-rc4 and later. Miguel, perhaps do a back merge to resolve
the conflict?

>
> from the origin tree and commit:
>
>   560a7a9b9267f ("rust: add `const_assert!` macro")
>
> from the rust 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/Makefile.build
> index 3652b85be5459,a6d1a2b210aaa..0000000000000
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@@ -310,7 -310,7 +310,8 @@@ $(obj)/%.lst: $(obj)/%.c FORC
>   
>   # The features in this list are the ones allowed for non-`rust/` code.
>   #
>  +#   - Stable since Rust 1.79.0: `feature(slice_ptr_len)`.
> + #   - Stable since Rust 1.79.0: `feature(inline_const)`.

I think we would want the lines to be merged on rust-next. This is fine on
linux-next, though.

>   #   - Stable since Rust 1.81.0: `feature(lint_reasons)`.
>   #   - Stable since Rust 1.82.0: `feature(asm_const)`,
>   #     `feature(offset_of_nested)`, `feature(raw_ref_op)`.
> @@@ -321,7 -320,7 +322,7 @@@
>   #
>   # Please see https://github.com/Rust-for-Linux/linux/issues/2 for details on
>   # the unstable features in use.
> - rust_allowed_features := asm_const,asm_goto,arbitrary_self_types,lint_reasons,offset_of_nested,raw_ref_op,slice_ptr_len,strict_provenance,used_with_arg
>  -rust_allowed_features := asm_const,asm_goto,arbitrary_self_types,inline_const,lint_reasons,offset_of_nested,raw_ref_op,used_with_arg
> ++rust_allowed_features := asm_const,asm_goto,arbitrary_self_types,inline_const,lint_reasons,offset_of_nested,raw_ref_op,slice_ptr_lenstrict_provenance,used_with_arg

I think this is missing a comma between slice_ptr_len and strict_provenance.

>   
>   # `--out-dir` is required to avoid temporaries being created by `rustc` in the
>   # current working directory, which may be not accessible in the out-of-tree

Thanks,
Gary