Subject: linux-next: build failure after merge of the block tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 20 Dec 2024 13:10:54 +1100

Hi all,

After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:

error[E0425]: cannot find value `BLK_MQ_F_SHOULD_MERGE` in crate `bindings`
  --> rust/kernel/block/mq/tag_set.rs:55:38
   |
55 |                     flags: bindings::BLK_MQ_F_SHOULD_MERGE,
   |                                      ^^^^^^^^^^^^^^^^^^^^^ not found in `bindings`

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0425`.

Caused by commit

  9377b95cda73 ("block: remove BLK_MQ_F_SHOULD_MERGE")

I have applied the following patch for today.

From: Stephen Rothwell <[email-masked]>
Date: Fri, 20 Dec 2024 12:43:38 +1100
Subject: [PATCH] fixup for "block: remove BLK_MQ_F_SHOULD_MERGE"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 rust/kernel/block/mq/tag_set.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/kernel/block/mq/tag_set.rs b/rust/kernel/block/mq/tag_set.rs
index d7f175a05d99..00ddcc71dfa2 100644
--- a/rust/kernel/block/mq/tag_set.rs
+++ b/rust/kernel/block/mq/tag_set.rs
@@ -52,7 +52,7 @@ pub fn new(
                     numa_node: bindings::NUMA_NO_NODE,
                     queue_depth: num_tags,
                     cmd_size,
-                    flags: bindings::BLK_MQ_F_SHOULD_MERGE,
+                    flags: 0,
                     driver_data: core::ptr::null_mut::<crate::ffi::c_void>(),
                     nr_maps: num_maps,
                     ..tag_set
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell