From d6d00d7560f3bdad1179108ef6fd92e044007bcd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 8 Apr 2025 17:12:02 +0200 Subject: [PATCH] drop some 6.14 rust patches --- ...e-send-for-driver-trait-implementers.patch | 44 ------------------- ...e-send-for-driver-trait-implementers.patch | 39 ---------------- queue-6.14/series | 2 - 3 files changed, 85 deletions(-) delete mode 100644 queue-6.14/rust-pci-require-send-for-driver-trait-implementers.patch delete mode 100644 queue-6.14/rust-platform-require-send-for-driver-trait-implementers.patch diff --git a/queue-6.14/rust-pci-require-send-for-driver-trait-implementers.patch b/queue-6.14/rust-pci-require-send-for-driver-trait-implementers.patch deleted file mode 100644 index 17d830c41c..0000000000 --- a/queue-6.14/rust-pci-require-send-for-driver-trait-implementers.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 935e1d90bf6f14cd190b3a95f3cbf7e298123043 Mon Sep 17 00:00:00 2001 -From: Danilo Krummrich -Date: Wed, 19 Mar 2025 15:52:55 +0100 -Subject: rust: pci: require Send for Driver trait implementers - -From: Danilo Krummrich - -commit 935e1d90bf6f14cd190b3a95f3cbf7e298123043 upstream. - -The instance of Self, returned and created by Driver::probe() is -dropped in the bus' remove() callback. - -Request implementers of the Driver trait to implement Send, since the -remove() callback is not guaranteed to run from the same thread as -probe(). - -Fixes: 1bd8b6b2c5d3 ("rust: pci: add basic PCI device / driver abstractions") -Cc: stable -Reported-by: Alice Ryhl -Closes: https://lore.kernel.org/lkml/Z9rDxOJ2V2bPjj5i@google.com/ -Signed-off-by: Danilo Krummrich -Reviewed-by: Benno Lossin -Link: https://lore.kernel.org/r/20250319145350.69543-1-dakr@kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - rust/kernel/pci.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs -index 0d09ae34a64d..22a32172b108 100644 ---- a/rust/kernel/pci.rs -+++ b/rust/kernel/pci.rs -@@ -222,7 +222,7 @@ macro_rules! pci_device_table { - ///``` - /// Drivers must implement this trait in order to get a PCI driver registered. Please refer to the - /// `Adapter` documentation for an example. --pub trait Driver { -+pub trait Driver: Send { - /// The type holding information about each device id supported by the driver. - /// - /// TODO: Use associated_type_defaults once stabilized: --- -2.49.0 - diff --git a/queue-6.14/rust-platform-require-send-for-driver-trait-implementers.patch b/queue-6.14/rust-platform-require-send-for-driver-trait-implementers.patch deleted file mode 100644 index 3b1b9fe6bd..0000000000 --- a/queue-6.14/rust-platform-require-send-for-driver-trait-implementers.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 51d0de7596a458096756c895cfed6bc4a7ecac10 Mon Sep 17 00:00:00 2001 -From: Danilo Krummrich -Date: Wed, 19 Mar 2025 15:52:56 +0100 -Subject: rust: platform: require Send for Driver trait implementers - -From: Danilo Krummrich - -commit 51d0de7596a458096756c895cfed6bc4a7ecac10 upstream. - -The instance of Self, returned and created by Driver::probe() is -dropped in the bus' remove() callback. - -Request implementers of the Driver trait to implement Send, since the -remove() callback is not guaranteed to run from the same thread as -probe(). - -Fixes: 683a63befc73 ("rust: platform: add basic platform device / driver abstractions") -Cc: stable -Reported-by: Alice Ryhl -Closes: https://lore.kernel.org/lkml/Z9rDxOJ2V2bPjj5i@google.com/ -Signed-off-by: Danilo Krummrich -Reviewed-by: Benno Lossin -Link: https://lore.kernel.org/r/20250319145350.69543-2-dakr@kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - rust/kernel/platform.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/rust/kernel/platform.rs -+++ b/rust/kernel/platform.rs -@@ -149,7 +149,7 @@ macro_rules! module_platform_driver { - /// } - /// } - ///``` --pub trait Driver { -+pub trait Driver: Send { - /// The type holding driver private data about each device id supported by the driver. - /// - /// TODO: Use associated_type_defaults once stabilized: diff --git a/queue-6.14/series b/queue-6.14/series index 3af7fda874..bf2cb9349f 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -657,8 +657,6 @@ tty-serial-fsl_lpuart-use-u32-and-u8-for-register-va.patch tty-serial-fsl_lpuart-use-port-struct-directly-to-si.patch tty-serial-lpuart-only-disable-cts-instead-of-overwr.patch usbnet-fix-npe-during-rx_complete.patch -rust-pci-require-send-for-driver-trait-implementers.patch -rust-platform-require-send-for-driver-trait-implementers.patch rust-fix-enabling-rust-and-building-with-gcc-for-loongarch.patch loongarch-increase-arch_dma_minalign-up-to-16.patch loongarch-increase-max_io_pics-up-to-8.patch -- 2.47.3