linux-kernel - [PATCH] rust: block: fix merge error

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250917114605.93028-1-spasswolf@web.de>
Date: Wed, 17 Sep 2025 13:46:04 +0200
From: Bert Karwatzki <spasswolf@....de>
To: Mark Brown <broonie@...nel.org>
Cc: Bert Karwatzki <spasswolf@....de>,
	linux-kernel@...r.kernel.org,
	linux-next@...r.kernel.org
Subject: [PATCH] rust: block: fix merge error

Fix the this compile error:

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

Signed-off-by: Bert Karwatzki <spasswolf@....de>
---
 rust/kernel/block/mq/gen_disk.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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,
-- 
2.47.3

linux-next-20250916 failt to compile with CONFIG_RUST=y and
the following error:

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[5]: *** [rust/Makefile:553: rust/kernel.o] Fehler 1

git blame shows commit
6e86e08cdc198 ("Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git")
as introducing the error:

$ git blame rust/kernel/block/mq/gen_disk.rs -L 12,12
6e86e08cdc198 (Mark Brown       2025-09-16 14:30:20 +0100 12)     fmt::{self, Write};

This patch fixes that.

Bert Karwatzki