linux-next: manual merge of the rust tree with the driver-core tree

[Mark Brown]

Hi all,

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

  rust/kernel/lib.rs

between commit:

  842aedc3907de ("rust: Add cpu_relax() helper")

from the driver-core tree and commit:

  ea60cea07d8c6 ("rust: add `Alignment` type")

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 fa083aa44cd6f,f910a5ab80ba5..0000000000000
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@@ -17,8 -17,8 +17,9 @@@
  // the unstable features in use.
  //
  // Stable since Rust 1.79.0.
+ #![feature(generic_nonzero)]
  #![feature(inline_const)]
 +#![feature(pointer_is_aligned)]
  //
  // Stable since Rust 1.81.0.
  #![feature(lint_reasons)]
@@@ -115,7 -112,7 +117,8 @@@ pub mod pid_namespace
  pub mod platform;
  pub mod prelude;
  pub mod print;
 +pub mod processor;
+ pub mod ptr;
  pub mod rbtree;
  pub mod regulator;
  pub mod revocable;

Attachment: signature.asc
Description: PGP signature