drop a rust patch from 6.1 and 6.6

diff --git a/queue-6.1/rust-kernel-require-send-for-module-implementations.patch b/queue-6.1/rust-kernel-require-send-for-module-implementations.patch
deleted file mode 100644 (file)
index 71dc25a..0000000
--- a/queue-6.1/rust-kernel-require-send-for-module-implementations.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 323617f649c0966ad5e741e47e27e06d3a680d8f Mon Sep 17 00:00:00 2001
-From: Wedson Almeida Filho <walmeida@microsoft.com>
-Date: Thu, 28 Mar 2024 16:54:54 -0300
-Subject: rust: kernel: require `Send` for `Module` implementations
-
-From: Wedson Almeida Filho <walmeida@microsoft.com>
-
-commit 323617f649c0966ad5e741e47e27e06d3a680d8f upstream.
-
-The thread that calls the module initialisation code when a module is
-loaded is not guaranteed [in fact, it is unlikely] to be the same one
-that calls the module cleanup code on module unload, therefore, `Module`
-implementations must be `Send` to account for them moving from one
-thread to another implicitly.
-
-Signed-off-by: Wedson Almeida Filho <walmeida@microsoft.com>
-Reviewed-by: Alice Ryhl <aliceryhl@google.com>
-Reviewed-by: Benno Lossin <benno.lossin@proton.me>
-Cc: stable@vger.kernel.org # 6.8.x: df70d04d5697: rust: phy: implement `Send` for `Registration`
-Cc: stable@vger.kernel.org
-Fixes: 247b365dc8dc ("rust: add `kernel` crate")
-Link: https://lore.kernel.org/r/20240328195457.225001-3-wedsonaf@gmail.com
-Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- rust/kernel/lib.rs |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/rust/kernel/lib.rs
-+++ b/rust/kernel/lib.rs
-@@ -37,7 +37,7 @@ const __LOG_PREFIX: &[u8] = b"rust_kerne
- /// The top level entrypoint to implementing a kernel module.
- ///
- /// For any teardown or cleanup operations, your type may implement [`Drop`].
--pub trait Module: Sized + Sync {
-+pub trait Module: Sized + Sync + Send {
-     /// Called at module initialization time.
-     ///
-     /// Use this method to perform whatever setup or registration your module

diff --git a/queue-6.1/series b/queue-6.1/series
index 820c5e0f0cb1fda89014ee5af78093b8f0949a8f..99181ccb7e61344af97da240c90914d28ae4083b 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -61,7 +61,6 @@ revert-crypto-api-disallow-identical-driver-names.patch
 virtio_net-do-not-send-rss-key-if-it-is-not-supported.patch
 fork-defer-linking-file-vma-until-vma-is-fully-initialized.patch
 x86-cpu-fix-check-for-rdpkru-in-__show_regs.patch
-rust-kernel-require-send-for-module-implementations.patch
 rust-don-t-select-constructors.patch
 rust-make-mutually-exclusive-with-cfi_clang.patch
 bluetooth-fix-type-of-len-in-l2cap-sco-_sock_getsockopt_old.patch

diff --git a/queue-6.6/rust-kernel-require-send-for-module-implementations.patch b/queue-6.6/rust-kernel-require-send-for-module-implementations.patch
deleted file mode 100644 (file)
index d201d1a..0000000
--- a/queue-6.6/rust-kernel-require-send-for-module-implementations.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 323617f649c0966ad5e741e47e27e06d3a680d8f Mon Sep 17 00:00:00 2001
-From: Wedson Almeida Filho <walmeida@microsoft.com>
-Date: Thu, 28 Mar 2024 16:54:54 -0300
-Subject: rust: kernel: require `Send` for `Module` implementations
-
-From: Wedson Almeida Filho <walmeida@microsoft.com>
-
-commit 323617f649c0966ad5e741e47e27e06d3a680d8f upstream.
-
-The thread that calls the module initialisation code when a module is
-loaded is not guaranteed [in fact, it is unlikely] to be the same one
-that calls the module cleanup code on module unload, therefore, `Module`
-implementations must be `Send` to account for them moving from one
-thread to another implicitly.
-
-Signed-off-by: Wedson Almeida Filho <walmeida@microsoft.com>
-Reviewed-by: Alice Ryhl <aliceryhl@google.com>
-Reviewed-by: Benno Lossin <benno.lossin@proton.me>
-Cc: stable@vger.kernel.org # 6.8.x: df70d04d5697: rust: phy: implement `Send` for `Registration`
-Cc: stable@vger.kernel.org
-Fixes: 247b365dc8dc ("rust: add `kernel` crate")
-Link: https://lore.kernel.org/r/20240328195457.225001-3-wedsonaf@gmail.com
-Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- rust/kernel/lib.rs |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/rust/kernel/lib.rs
-+++ b/rust/kernel/lib.rs
-@@ -60,7 +60,7 @@ const __LOG_PREFIX: &[u8] = b"rust_kerne
- /// The top level entrypoint to implementing a kernel module.
- ///
- /// For any teardown or cleanup operations, your type may implement [`Drop`].
--pub trait Module: Sized + Sync {
-+pub trait Module: Sized + Sync + Send {
-     /// Called at module initialization time.
-     ///
-     /// Use this method to perform whatever setup or registration your module

diff --git a/queue-6.6/series b/queue-6.6/series
index b45dc2a658a4ce80b8e501be9e993b15afdf335b..4a7a68e7ea7204262bbc4fd9b7dbecbe64c77366 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -109,7 +109,6 @@ selftests-seccomp-change-the-syscall-used-in-kill_thread-test.patch
 selftests-seccomp-handle-einval-on-unshare-clone_newpid.patch
 fork-defer-linking-file-vma-until-vma-is-fully-initialized.patch
 x86-cpu-fix-check-for-rdpkru-in-__show_regs.patch
-rust-kernel-require-send-for-module-implementations.patch
 rust-don-t-select-constructors.patch
 rust-init-remove-impl-zeroable-for-infallible.patch
 rust-make-mutually-exclusive-with-cfi_clang.patch