6.12-stable patches

added patches:
	docs-rust-remove-spurious-item-in-expect-list.patch

diff --git a/queue-6.12/docs-rust-remove-spurious-item-in-expect-list.patch b/queue-6.12/docs-rust-remove-spurious-item-in-expect-list.patch
new file mode 100644 (file)
index 0000000..ee0271a
--- /dev/null
+++ b/queue-6.12/docs-rust-remove-spurious-item-in-expect-list.patch
@@ -0,0 +1,38 @@
+From b160dc46dd9af4001c802cc9c7d68b6ba58d27c4 Mon Sep 17 00:00:00 2001
+From: Miguel Ojeda <ojeda@kernel.org>
+Date: Sun, 17 Nov 2024 14:31:27 +0100
+Subject: docs: rust: remove spurious item in `expect` list
+
+From: Miguel Ojeda <ojeda@kernel.org>
+
+commit b160dc46dd9af4001c802cc9c7d68b6ba58d27c4 upstream.
+
+This list started as a "when to prefer `expect`" list, but at some point
+during writing I changed it to a "prefer `expect` unless..." one. However,
+the first bullet remained, which does not make sense anymore.
+
+Thus remove it. In addition, fix nearby typo.
+
+Fixes: 04866494e936 ("Documentation: rust: discuss `#[expect(...)]` in the guidelines")
+Reviewed-by: Alice Ryhl <aliceryhl@google.com>
+Reviewed-by: Andreas Hindborg <a.hindborg@kernel.org>
+Link: https://lore.kernel.org/r/20241117133127.473937-1-ojeda@kernel.org
+Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/rust/coding-guidelines.rst |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/Documentation/rust/coding-guidelines.rst
++++ b/Documentation/rust/coding-guidelines.rst
+@@ -296,9 +296,7 @@ may happen in several situations, e.g.:
+ It also increases the visibility of the remaining ``allow``\ s and reduces the
+ chance of misapplying one.
+ 
+-Thus prefer ``except`` over ``allow`` unless:
+-
+-- The lint attribute is intended to be temporary, e.g. while developing.
++Thus prefer ``expect`` over ``allow`` unless:
+ 
+ - Conditional compilation triggers the warning in some cases but not others.
+ 

diff --git a/queue-6.12/series b/queue-6.12/series
index f6f7414630fefe94a2cfde9676d267d5e8a41a1c..64762ec3af6bc335de73b8f170eb5a6005eb1fd9 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -258,3 +258,4 @@ fs-netfs-read_collect-fix-crash-due-to-uninitialized-prev-variable.patch
 kbuild-hdrcheck-fix-cross-build-with-clang.patch
 alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch
 nvme-tcp-fix-a-c2htermreq-error-message.patch
+docs-rust-remove-spurious-item-in-expect-list.patch