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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  rust/kernel/block/mq.rs

between commit:

  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.rs
index c0ec06b843555,61ea35bba7d50..0000000000000
--- a/rust/kernel/block/mq.rs
+++ b/rust/kernel/block/mq.rs
@@@ -89,7 -82,7 +89,7 @@@
  //!     Arc::pin_init(TagSet::new(1, 256, 1), flags::GFP_KERNEL)?;
  //! let mut disk = gen_disk::GenDiskBuilder::new()
  //!     .capacity_sectors(4096)
- //!     .build(format_args!("myblk"), tagset, ())?;
 -//!     .build(fmt!("myblk"), tagset)?;
++//!     .build(fmt!("myblk"), tagset, ())?;
  //!
  //! # Ok::<(), kernel::error::Error>(())
  //! ```

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