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

[Mark Brown]

Hi all,

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

  rust/kernel/block/mq/gen_disk.rs

between commits:

  f4b72f1558be1 ("rust: block: normalize imports for `gen_disk.rs`")
  c3a54220b54a1 ("rust: block: use `NullTerminatedFormatter`")
  90d952fac8ac1 ("rust: block: add `GenDisk` private data support")

from the block tree and commit:

  e0be3d34f1089 ("rust: block: use `kernel::{fmt,prelude::fmt!}`")

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/block/mq/gen_disk.rs
index 46ec802699706,be92d0e5f0312..0000000000000
--- a/rust/kernel/block/mq/gen_disk.rs
+++ b/rust/kernel/block/mq/gen_disk.rs
@@@ -3,19 -3,12 +3,19 @@@
  //! Generic disk abstraction.
  //!
  //! C header: [`include/linux/blkdev.h`](srctree/include/linux/blkdev.h)
- //! C header: [`include/linux/blk_mq.h`](srctree/include/linux/blk_mq.h)
+ //! C header: [`include/linux/blk-mq.h`](srctree/include/linux/blk-mq.h)
  
 -use crate::block::mq::{raw_writer::RawWriter, Operations, TagSet};
 -use crate::fmt::{self, Write};
 -use crate::{bindings, error::from_err_ptr, error::Result, sync::Arc};
 -use crate::{error, static_lock_class};
 +use crate::{
 +    bindings,
 +    block::mq::{Operations, TagSet},
 +    error::{self, from_err_ptr, Result},
++    fmt::{self, Write};
 +    prelude::*,
 +    static_lock_class,
 +    str::NullTerminatedFormatter,
 +    sync::Arc,
 +    types::{ForeignOwnable, ScopeGuard},
 +};
- use core::fmt::{self, Write};
  
  /// A builder for [`GenDisk`].
  ///

Attachment: signature.asc
Description: PGP signature