linux-next: manual merge of the drm tree with the rust tree
Subsystems (6)
Mark Brown
maintainerHi all,
Today's linux-next merge of the drm tree got conflicts in:
rust/kernel/lib.rs
scripts/Makefile.build
between commit:
d1aa40daa777c ("rust: kbuild: remove feature(...)s that are now stable")
from the rust tree and commits:
80df573af9ef3 ("rust: drm: gem: shmem: Add DRM shmem helper abstraction") 3cc319d5f433a ("rust: enable the generic_arg_infer feature")
from the drm 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.
drivers/gpu/drm/tyr/driver.rs +0 -0
rust/kernel/lib.rs +0 -0
@@@ -16,9 -16,38 +16,12 @@@// Please see https://github.com/Rust-for-Linux/linux/issues/2 for details on // the unstable features in use. // -// Stable since Rust 1.79.0. -#![feature(generic_nonzero)] -#![feature(inline_const)] -#![feature(pointer_is_aligned)] -#![feature(slice_ptr_len)] -// -// Stable since Rust 1.80.0. -#![feature(slice_flatten)] -// -// Stable since Rust 1.81.0. -#![feature(lint_reasons)] -// -// Stable since Rust 1.82.0. -#![feature(offset_of_nested)] -#![feature(raw_ref_op)] -// -// Stable since Rust 1.83.0. -#![feature(const_maybe_uninit_as_mut_ptr)] -#![feature(const_mut_refs)] -#![feature(const_option)] -#![feature(const_ptr_write)] -#![feature(const_refs_to_cell)] -#![feature(const_refs_to_static)] -// -// Stable since Rust 1.84.0. -#![feature(strict_provenance)] -// +// Stable since Rust 1.89.0. + #![feature(generic_arg_infer)] +// // Expected to become stable. #![feature(arbitrary_self_types)] +#![feature(derive_coerce_pointee)]// // To be determined. #![feature(used_with_arg)]
scripts/Makefile.build +0 -0
@@@ -310,13 -310,19 +310,14 @@@ $(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.81.0: `feature(lint_reasons)`. -# - Stable since Rust 1.82.0: `feature(asm_const)`, -# `feature(offset_of_nested)`, `feature(raw_ref_op)`. -# - Stable since Rust 1.84.0: `feature(strict_provenance)`. # - Stable since Rust 1.87.0: `feature(asm_goto)`. + # - Stable since Rust 1.89.0: `feature(generic_arg_infer)`. # - Expected to become stable: `feature(arbitrary_self_types)`. # - To be determined: `feature(used_with_arg)`. # # Please see https://github.com/Rust-for-Linux/linux/issues/2 for details on # the unstable features in use. - rust_allowed_features := arbitrary_self_types,asm_goto,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 := arbitrary_self_types,asm_goto,generic_arg_infer,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
Quoted 2 lines · Mark Brown
I fixed it up (see below) and can carry the fix as necessary.
Looks good, thanks!
Cheers,
Miguel