linux-next: manual merge of the rust tree with the block tree
Subsystems (3)
Mark Brown
maintainerHi 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.
rust/kernel/block/mq.rs +0 -0
@@@ -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>(()) //! ```
Andreas Hindborg
maintainerQuoted 28 lines · Mark Brown
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
rust/kernel/block/mq.rsbetween commit:
90d952fac8ac1("rust: block: addGenDiskprivate data support")from the block tree and commit:
e0be3d34f1089("rust: block: usekernel::{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.
rust/kernel/block/mq.rs +0
-0
rust/kernel/block/mq.rs
Quoted 9 lines
rust/kernel/block/mq.rs +1
-1@@@ -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>(()) //! ```
Thanks, looks good to me.
Best regards,
Andreas Hindborg