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

[Stephen Rothwell]

Hi all,

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

  rust/kernel/str.rs

between commit:

  51d9ee90ea90 ("rust: str: add radix prefixed integer parsing functions")

from the modules tree and commit:

  3b83f5d5e78a ("rust: replace `CStr` with `core::ffi::CStr`")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc rust/kernel/str.rs
index a1a3581eb546,7593d758fbb7..000000000000
--- a/rust/kernel/str.rs
+++ b/rust/kernel/str.rs
@@@ -10,11 -10,11 +10,13 @@@ use crate::
  };
  use core::{
      marker::PhantomData,
-     ops::{self, Deref, DerefMut, Index},
+     ops::{Deref, DerefMut, Index},
  };
  
+ pub use crate::prelude::CStr;
+ 
 +pub mod parse_int;
 +
  /// Byte string without UTF-8 validity guarantee.
  #[repr(transparent)]
  pub struct BStr([u8]);

Attachment: pgpa1sBBuispT.pgp
Description: OpenPGP digital signature