* [PATCH] rust: block: fix merge error
@ 2025-09-17 11:46 Bert Karwatzki
0 siblings, 0 replies; only message in thread
From: Bert Karwatzki @ 2025-09-17 11:46 UTC (permalink / raw)
To: Mark Brown; +Cc: Bert Karwatzki, linux-kernel, linux-next
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@web•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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2025-09-17 11:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-17 11:46 [PATCH] rust: block: fix merge error Bert Karwatzki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox