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

[Mark Brown]

Hi all,

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

  rust/kernel/io.rs

between commit:

  f88db65aece9f ("rust: io: gate ioremap doctests on CONFIG_HAS_IOMEM")

from the driver-core.current tree and commits:

  65f6abf9fa816 ("rust: io: add missing safety requirement in `IoCapable` methods")
  bed01ca9e9cf8 ("rust: io: remove `MmioOwned`")

from the drm-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/io.rs
index d4063ee412000,95f46bb75f9e8..0000000000000
--- a/rust/kernel/io.rs
+++ b/rust/kernel/io.rs
@@@ -4,12 -4,20 +4,21 @@@
  //!
  //! C header: [`include/asm-generic/io.h`](srctree/include/asm-generic/io.h)
  
+ use core::{
+     marker::PhantomData,
+     mem::MaybeUninit, //
+ };
+ 
  use crate::{
      bindings,
-     prelude::*, //
+     prelude::*,
+     ptr::{
+         Alignment,
+         KnownSize, //
+     }, //
  };
  
 +#[cfg(CONFIG_HAS_IOMEM)]
  pub mod mem;
  pub mod poll;
  pub mod register;

Attachment: signature.asc
Description: PGP signature