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

[Mark Brown]

Hi all,

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

  rust/kernel/lib.rs

between commits:

  08da98f18f4f9 ("rust: ptr: add `KnownSize` trait to support DST size info extraction")
  f41941aab3acd ("rust: ptr: add projection infrastructure")

from the origin tree and commit:

  7fa2b092b1ff8 ("rust: kbuild: remove `feature(...)`s that are now stable")

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 rust/kernel/lib.rs
index d93292d47420f,b48221a5b4ec5..0000000000000
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@@ -16,33 -16,9 +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(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)]
- //
 +// Stable since Rust 1.84.0.
 +#![feature(strict_provenance)]
 +//
  // Expected to become stable.
  #![feature(arbitrary_self_types)]
+ #![feature(derive_coerce_pointee)]
  //
  // To be determined.
  #![feature(used_with_arg)]

Attachment: signature.asc
Description: PGP signature