6.12-stable patches

added patches:
	rust-block-fix-formatting-in-gendisk-doc.patch
	series

diff --git a/queue-6.12/rust-block-fix-formatting-in-gendisk-doc.patch b/queue-6.12/rust-block-fix-formatting-in-gendisk-doc.patch
new file mode 100644 (file)
index 0000000..4eb7c8a
--- /dev/null
+++ b/queue-6.12/rust-block-fix-formatting-in-gendisk-doc.patch
@@ -0,0 +1,46 @@
+From 0c5928deada15a8d075516e6e0d9ee19011bb000 Mon Sep 17 00:00:00 2001
+From: Yutaro Ohno <yutaro.ono.418@gmail.com>
+Date: Thu, 24 Oct 2024 00:54:59 +0900
+Subject: rust: block: fix formatting in GenDisk doc
+
+From: Yutaro Ohno <yutaro.ono.418@gmail.com>
+
+commit 0c5928deada15a8d075516e6e0d9ee19011bb000 upstream.
+
+Align bullet points and improve indentation in the `Invariants` section
+of the `GenDisk` struct documentation for better readability.
+
+[ Yutaro is also working on implementing the lint we suggested to catch
+  this sort of issue in upstream Rust:
+
+    https://github.com/rust-lang/rust-clippy/issues/13601
+    https://github.com/rust-lang/rust-clippy/pull/13711
+
+  Thanks a lot! - Miguel ]
+
+Fixes: 3253aba3408a ("rust: block: introduce `kernel::block::mq` module")
+Signed-off-by: Yutaro Ohno <yutaro.ono.418@gmail.com>
+Reviewed-by: Boqun Feng <boqun.feng@gmail.com>
+Acked-by: Andreas Hindborg <a.hindborg@kernel.org>
+Link: https://lore.kernel.org/r/ZxkcU5yTFCagg_lX@ohnotp
+Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ rust/kernel/block/mq/gen_disk.rs |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/rust/kernel/block/mq/gen_disk.rs
++++ b/rust/kernel/block/mq/gen_disk.rs
+@@ -174,9 +174,9 @@ impl GenDiskBuilder {
+ ///
+ /// # Invariants
+ ///
+-///  - `gendisk` must always point to an initialized and valid `struct gendisk`.
+-///  - `gendisk` was added to the VFS through a call to
+-///     `bindings::device_add_disk`.
++/// - `gendisk` must always point to an initialized and valid `struct gendisk`.
++/// - `gendisk` was added to the VFS through a call to
++///   `bindings::device_add_disk`.
+ pub struct GenDisk<T: Operations> {
+     _tagset: Arc<TagSet<T>>,
+     gendisk: *mut bindings::gendisk,

diff --git a/queue-6.12/series b/queue-6.12/series
new file mode 100644 (file)
index 0000000..b65c7ec
--- /dev/null
+++ b/queue-6.12/series
@@ -0,0 +1 @@
+rust-block-fix-formatting-in-gendisk-doc.patch