Build break due to merge commit in linux-next 20250916

[Christian Heusel]

Hey Mark,

I have noticed that the recent linux-next release fails to build due to
a syntax error in the rust code:

      EXPORTS rust/exports_bindings_generated.h
      RUSTC L rust/kernel.o
    error: expected one of `,` or `}`, found `;`
      --> rust/kernel/block/mq/gen_disk.rs:12:23
       |
    12 |     fmt::{self, Write};
       |                       ^
       |                       |
       |                       expected one of `,` or `}`
       |                       help: missing `,`

    error: aborting due to 1 previous error

    make[2]: *** [rust/Makefile:553: rust/kernel.o] Error 1

It seems like this error was introduced in 6e86e08cdc19 ("Merge branch
'rust-next' of https://github.com/Rust-for-Linux/linux.git";) and
introduced with the merge, the attached patch fixes it.

Cheers,
Chris
diff --git a/rust/kernel/block/mq/gen_disk.rs b/rust/kernel/block/mq/gen_disk.rs
index 51a239118ead..1ce815c8cdab 100644
--- a/rust/kernel/block/mq/gen_disk.rs
+++ b/rust/kernel/block/mq/gen_disk.rs
@@ -9,7 +9,7 @@
     bindings,
     block::mq::{Operations, TagSet},
     error::{self, from_err_ptr, Result},
-    fmt::{self, Write};
+    fmt::{self, Write},
     prelude::*,
     static_lock_class,
     str::NullTerminatedFormatter,

Attachment: signature.asc
Description: PGP signature