Skip to contentSkip to conversation

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

PATCH Mark Brown 3 participants 3 messages Sep 15, 2025 – Sep 17, 2025

Subsystems (3)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

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

rust/kernel/block/mq/operations.rs

between commit:

90d952fac8ac1 ("rust: block: add GenDisk private data support")

from the block tree and commit:

b6dd7b75496c5 ("rust: block: convert block::mq to use Refcount")

from the tip 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/operations.rs +0 -0
diff --cc rust/kernel/block/mq/operations.rs
index d098a8a3e4340,c0f95a9419c4e..0000000000000
@@@ -6,15 -6,15 +6,16 @@@
  
  use crate::{
      bindings,
 -    block::mq::request::RequestDataWrapper,
 -    block::mq::Request,
 +    block::mq::{request::RequestDataWrapper, Request},
      error::{from_result, Result},
      prelude::*,
+     sync::Refcount,
 -    types::ARef,
 +    types::{ARef, ForeignOwnable},
  };
- use core::{marker::PhantomData, sync::atomic::AtomicU64, sync::atomic::Ordering};
+ use core::marker::PhantomData;
  
 +type ForeignBorrowed<'a, T> = <T as ForeignOwnable>::Borrowed<'a>;
 +
  /// Implement this trait to interface blk-mq as block devices.
  ///
  /// To implement a block device driver, implement this trait as described in the
#1 lore raw
Quoted 2 lines · Mark Brown

Hi all,

Hi Mark,

Thanks for reporting this. Your resolution looks good to me. Thanks!

Jens and Andreas, if you want to test this, please wait until the fix
[1] of tip/locking/core (top commit should be 17d9f8eaa87d "MAINTAINERS:
update atomic infrastructure entry to include Rust") to propagate to tip/master (and then linux-next), otherwise you will get a compile error because of missing a patch. Of course feel free to test with a manual merge of tip/locking/core and block/for-next ;-)

[1]: https://lore.kernel.org/lkml/[email protected]/

Regards,
Boqun

Quoted 46 lines

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

rust/kernel/block/mq/operations.rs

between commit:

90d952fac8ac1 ("rust: block: add GenDisk private data support")

from the block tree and commit:

b6dd7b75496c5 ("rust: block: convert block::mq to use Refcount")

from the tip 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/operations.rs +2 -1
diff --cc rust/kernel/block/mq/operations.rs
index d098a8a3e4340,c0f95a9419c4e..0000000000000
@@@ -6,15 -6,15 +6,16 @@@
 
  use crate::{
      bindings,
 -    block::mq::request::RequestDataWrapper,
 -    block::mq::Request,
 +    block::mq::{request::RequestDataWrapper, Request},
      error::{from_result, Result},
      prelude::*,
+     sync::Refcount,
 -    types::ARef,
 +    types::{ARef, ForeignOwnable},
  };
- use core::{marker::PhantomData, sync::atomic::AtomicU64, sync::atomic::Ordering};
+ use core::marker::PhantomData;
 
 +type ForeignBorrowed<'a, T> = <T as ForeignOwnable>::Borrowed<'a>;
 +
  /// Implement this trait to interface blk-mq as block devices.
  ///
  /// To implement a block device driver, implement this trait as described in the
maintainer
#2 lore raw
In reply to Mark Brown
Quoted 38 lines · Mark Brown

Hi all,

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

rust/kernel/block/mq/operations.rs

between commit:

90d952fac8ac1 ("rust: block: add GenDisk private data support")

from the block tree and commit:

b6dd7b75496c5 ("rust: block: convert block::mq to use Refcount")

from the tip 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/operations.rs +1 -0
diff --cc rust/kernel/block/mq/operations.rs
index d098a8a3e4340,c0f95a9419c4e..0000000000000
@@@ -6,15 -6,15 +6,16 @@@
 
  use crate::{
      bindings,
 -    block::mq::request::RequestDataWrapper,
 -    block::mq::Request,
 +    block::mq::{request::RequestDataWrapper, Request},
      error::{from_result, Result},
      prelude::*,
+     sync::Refcount,
 -    types::ARef,

rust/kernel/block/mq/operations.rs

Quoted 10 lines
rust/kernel/block/mq/operations.rs +1 -1
 +    types::{ARef, ForeignOwnable},
  };
- use core::{marker::PhantomData, sync::atomic::AtomicU64, sync::atomic::Ordering};
+ use core::marker::PhantomData;
 
 +type ForeignBorrowed<'a, T> = <T as ForeignOwnable>::Borrowed<'a>;
 +
  /// Implement this trait to interface blk-mq as block devices.
  ///
  /// To implement a block device driver, implement this trait as described in the

Looks good to me, thanks!

Best regards,
Andreas Hindborg