linux-next: manual merge of the drm-rust tree with the rust-next tree

linux-next: manual merge of the drm-rust tree with the rust-next tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1792 bytes --]

Hi all,

Today's linux-next merge of the drm-rust tree got a conflict in:

  scripts/Makefile.build

between commits:

  560a7a9b9267f ("rust: add `const_assert!` macro")
  3a2486cc1da5c ("kbuild: rust: provide an option to inline C helpers into Rust")

from the rust-next tree and commit:

  3cc319d5f433a ("rust: enable the `generic_arg_infer` feature")

from the drm-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 d2372d15f74c9,010d08472fb2b..0000000000000
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@@ -322,7 -322,7 +323,7 @@@ $(obj)/%.lst: $(obj)/%.c FORC
  #
  # 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,inline_const,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,generic_arg_infer,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,generic_arg_infer,inline_const,lint_reasons,offset_of_nested,raw_ref_op,slice_ptr_len,strict_provenance,used_with_arg
  
  # `--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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Miguel Ojeda]

On Mon, Mar 30, 2026 at 6:10 PM Mark Brown <broonie@kernel.org> wrote:
>
> I fixed it up (see below) and can carry the fix as necessary.

Looks good, thanks!

Cheers,
Miguel