From: Bert Karwatzki <spasswolf@web•de>
To: Mark Brown <broonie@kernel•org>
Cc: Bert Karwatzki <spasswolf@web•de>,
linux-kernel@vger•kernel.org, linux-next@vger•kernel.org
Subject: [PATCH] rust: block: fix merge error
Date: Wed, 17 Sep 2025 13:46:04 +0200 [thread overview]
Message-ID: <20250917114605.93028-1-spasswolf@web.de> (raw)
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
reply other threads:[~2025-09-17 11:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250917114605.93028-1-spasswolf@web.de \
--to=spasswolf@web$(echo .)de \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox