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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  rust/kernel/init.rs

between commit:

  a30e94c29673 ("rust: init: make doctests compilable/testable")

from the kunit-next tree and commit:

  35e7fca2ff59 ("rust: init: add `..Zeroable::zeroed()` syntax for zeroing all missing fields")

from the rust tree.

I fixed it up (I think - 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/init.rs
index e05563aad2ed,0071b2834b78..000000000000
--- a/rust/kernel/init.rs
+++ b/rust/kernel/init.rs
@@@ -522,9 -517,11 +526,10 @@@ macro_rules! stack_try_pin_init 
  /// For instance:
  ///
  /// ```rust
- /// # use kernel::{macros::pin_data, pin_init};
 -/// # use kernel::pin_init;
 -/// # use macros::{Zeroable, pin_data};
++/// # use kernel::{macros::Zeroable, pin_data, pin_init};
  /// # use core::{ptr::addr_of_mut, marker::PhantomPinned};
  /// #[pin_data]
+ /// #[derive(Zeroable)]
  /// struct Buf {
  ///     // `ptr` points into `buf`.
  ///     ptr: *mut u8,

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