drop duplicate rust patches

diff --git a/queue-6.12/bcachefs-avoid-truncating-fiemap-extent-length.patch b/queue-6.12/bcachefs-avoid-truncating-fiemap-extent-length.patch
index ebd346d294e7ebc6a209e5faa49d58b27824f768..9d85c6c3c29b03028d15428ae05b4b3e6538f8a9 100644 (file)
--- a/queue-6.12/bcachefs-avoid-truncating-fiemap-extent-length.patch
+++ b/queue-6.12/bcachefs-avoid-truncating-fiemap-extent-length.patch
@@ -28,14 +28,12 @@ Signed-off-by: Mikhail Dmitrichenko <mdmitrichenko@astralinux.ru>
 Acked-by: Kent Overstreet <kent.overstreet@linux.dev>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- fs/bcachefs/fs.c | 8 +++++---
+ fs/bcachefs/fs.c |    8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
-diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
-index a41d0d8a2f7beb..0dc2466de3f91c 100644
 --- a/fs/bcachefs/fs.c
 +++ b/fs/bcachefs/fs.c
-@@ -1184,6 +1184,8 @@ static int bch2_fill_extent(struct bch_fs *c,
+@@ -1184,6 +1184,8 @@ static int bch2_fill_extent(struct bch_f
                            struct fiemap_extent_info *info,
                            struct bkey_s_c k, unsigned flags)
  {
@@ -44,7 +42,7 @@ index a41d0d8a2f7beb..0dc2466de3f91c 100644
        if (bkey_extent_is_direct_data(k.k)) {
                struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);
                const union bch_extent_entry *entry;
-@@ -1212,7 +1214,7 @@ static int bch2_fill_extent(struct bch_fs *c,
+@@ -1212,7 +1214,7 @@ static int bch2_fill_extent(struct bch_f
                        ret = fiemap_fill_next_extent(info,
                                                bkey_start_offset(k.k) << 9,
                                                offset << 9,
@@ -53,7 +51,7 @@ index a41d0d8a2f7beb..0dc2466de3f91c 100644
                        if (ret)
                                return ret;
                }
-@@ -1221,13 +1223,13 @@ static int bch2_fill_extent(struct bch_fs *c,
+@@ -1221,13 +1223,13 @@ static int bch2_fill_extent(struct bch_f
        } else if (bkey_extent_is_inline_data(k.k)) {
                return fiemap_fill_next_extent(info,
                                               bkey_start_offset(k.k) << 9,
@@ -69,6 +67,3 @@ index a41d0d8a2f7beb..0dc2466de3f91c 100644
                                               flags|
                                               FIEMAP_EXTENT_DELALLOC|
                                               FIEMAP_EXTENT_UNWRITTEN);
--- 
-2.53.0
-

diff --git a/queue-6.18/rust-str-clean-unused-import-for-rust-1.98.patch-22556 b/queue-6.18/rust-str-clean-unused-import-for-rust-1.98.patch-22556
deleted file mode 100644 (file)
index a43d966..0000000
--- a/queue-6.18/rust-str-clean-unused-import-for-rust-1.98.patch-22556
+++ /dev/null
@@ -1,53 +0,0 @@
-From ff9be1416910b55d40528aa8f97292842741a137 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 9 Jun 2026 12:41:52 +0200
-Subject: rust: str: clean unused import for Rust >= 1.98
-
-From: Miguel Ojeda <ojeda@kernel.org>
-
-[ Upstream commit 3fff4271809b57182c4011811e96556bdd4cb2f9 ]
-
-Starting with Rust 1.98.0 (expected 2026-08-20), the compiler has changed
-how the resolution algorithm works [1] in upstream commit c4d84db5f184
-("Resolver: Batched import resolution."), and it now spots:
-
-    error: unused import: `flags::*`
-     --> rust/kernel/str.rs:7:9
-      |
-    7 |         flags::*,
-      |         ^^^^^^^^
-      |
-      = note: `-D unused-imports` implied by `-D warnings`
-      = help: to override `-D warnings` add `#[allow(unused_imports)]`
-
-It happens to not be needed because the `prelude::*` already provides
-the flags.
-
-Thus clean it up.
-
-Cc: stable@vger.kernel.org # Needed in 6.18.y and later (prelude added to `str`).
-Link: https://github.com/rust-lang/rust/pull/145108 [1]
-Reviewed-by: Gary Guo <gary@garyguo.net>
-Reviewed-by: Alice Ryhl <aliceryhl@google.com>
-Link: https://patch.msgid.link/20260609104152.261145-2-ojeda@kernel.org
-Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- rust/kernel/str.rs | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs
-index 3a276bc32962d9..22cefbc9852360 100644
---- a/rust/kernel/str.rs
-+++ b/rust/kernel/str.rs
-@@ -4,7 +4,6 @@
- 
- use crate::{
-     alloc::{
--        flags::*,
-         AllocError,
-         KVec, //
-     },
--- 
-2.53.0
-

diff --git a/queue-6.18/rust-str-use-the-kernel-vertical-imports-style.patch-6121 b/queue-6.18/rust-str-use-the-kernel-vertical-imports-style.patch-6121
deleted file mode 100644 (file)
index 7bae237..0000000
--- a/queue-6.18/rust-str-use-the-kernel-vertical-imports-style.patch-6121
+++ /dev/null
@@ -1,65 +0,0 @@
-From bdd11ea01c3f5e9daf7289fed6d2c4a2e9c20792 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 9 Jun 2026 12:41:51 +0200
-Subject: rust: str: use the "kernel vertical" imports style
-
-From: Miguel Ojeda <ojeda@kernel.org>
-
-[ Upstream commit 724a93a9f6033800b02a3530dbcb464638448e7f ]
-
-Convert the imports to use the "kernel vertical" imports style [1].
-
-No functional changes intended.
-
-Link: https://docs.kernel.org/rust/coding-guidelines.html#imports [1]
-Reviewed-by: Gary Guo <gary@garyguo.net>
-Link: https://patch.msgid.link/20260609104152.261145-1-ojeda@kernel.org
-Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-Stable-dep-of: 3fff4271809b ("rust: str: clean unused import for Rust >= 1.98")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- rust/kernel/str.rs | 25 ++++++++++++++++++++-----
- 1 file changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs
-index 8992fedabaf0f7..3a276bc32962d9 100644
---- a/rust/kernel/str.rs
-+++ b/rust/kernel/str.rs
-@@ -3,14 +3,29 @@
- //! String representations.
- 
- use crate::{
--    alloc::{flags::*, AllocError, KVec},
--    error::{to_result, Result},
--    fmt::{self, Write},
--    prelude::*,
-+    alloc::{
-+        flags::*,
-+        AllocError,
-+        KVec, //
-+    },
-+    error::{
-+        to_result,
-+        Result, //
-+    },
-+    fmt::{
-+        self,
-+        Write, //
-+    },
-+    prelude::*, //
- };
- use core::{
-     marker::PhantomData,
--    ops::{self, Deref, DerefMut, Index},
-+    ops::{
-+        self,
-+        Deref,
-+        DerefMut,
-+        Index, //
-+    }, //
- };
- 
- /// Byte string without UTF-8 validity guarantee.
--- 
-2.53.0
-

diff --git a/queue-6.18/series b/queue-6.18/series
index 81b70e05f407c8033a3c37468b692768d5ef0126..bafe9a3f464a3d17a5183f67da0b5ab90affb100 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -5,5 +5,3 @@ nfsd-release-layout-stid-on-setlease-failure.patch
 rust-str-use-the-kernel-vertical-imports-style.patch
 rust-str-clean-unused-import-for-rust-1.98.patch
 userfaultfd-gate-must_wait-writability-check-on-pte_.patch
-rust-str-use-the-kernel-vertical-imports-style.patch-6121
-rust-str-clean-unused-import-for-rust-1.98.patch-22556

diff --git a/queue-7.1/rust-str-clean-unused-import-for-rust-1.98.patch-12096 b/queue-7.1/rust-str-clean-unused-import-for-rust-1.98.patch-12096
deleted file mode 100644 (file)
index 409050d..0000000
--- a/queue-7.1/rust-str-clean-unused-import-for-rust-1.98.patch-12096
+++ /dev/null
@@ -1,53 +0,0 @@
-From 474b39b3ad8b17909795e92c5a7e78574ffe11ef Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 9 Jun 2026 12:41:52 +0200
-Subject: rust: str: clean unused import for Rust >= 1.98
-
-From: Miguel Ojeda <ojeda@kernel.org>
-
-[ Upstream commit 3fff4271809b57182c4011811e96556bdd4cb2f9 ]
-
-Starting with Rust 1.98.0 (expected 2026-08-20), the compiler has changed
-how the resolution algorithm works [1] in upstream commit c4d84db5f184
-("Resolver: Batched import resolution."), and it now spots:
-
-    error: unused import: `flags::*`
-     --> rust/kernel/str.rs:7:9
-      |
-    7 |         flags::*,
-      |         ^^^^^^^^
-      |
-      = note: `-D unused-imports` implied by `-D warnings`
-      = help: to override `-D warnings` add `#[allow(unused_imports)]`
-
-It happens to not be needed because the `prelude::*` already provides
-the flags.
-
-Thus clean it up.
-
-Cc: stable@vger.kernel.org # Needed in 6.18.y and later (prelude added to `str`).
-Link: https://github.com/rust-lang/rust/pull/145108 [1]
-Reviewed-by: Gary Guo <gary@garyguo.net>
-Reviewed-by: Alice Ryhl <aliceryhl@google.com>
-Link: https://patch.msgid.link/20260609104152.261145-2-ojeda@kernel.org
-Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- rust/kernel/str.rs | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs
-index a7fccd4c4f3b18..4517c1bc547afb 100644
---- a/rust/kernel/str.rs
-+++ b/rust/kernel/str.rs
-@@ -4,7 +4,6 @@
- 
- use crate::{
-     alloc::{
--        flags::*,
-         AllocError,
-         KVec, //
-     },
--- 
-2.53.0
-

diff --git a/queue-7.1/rust-str-use-the-kernel-vertical-imports-style.patch-28199 b/queue-7.1/rust-str-use-the-kernel-vertical-imports-style.patch-28199
deleted file mode 100644 (file)
index 2897945..0000000
--- a/queue-7.1/rust-str-use-the-kernel-vertical-imports-style.patch-28199
+++ /dev/null
@@ -1,64 +0,0 @@
-From 529f6ae7ec8428057c7220dfa69ebccd02b46fab Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 9 Jun 2026 12:41:51 +0200
-Subject: rust: str: use the "kernel vertical" imports style
-
-From: Miguel Ojeda <ojeda@kernel.org>
-
-[ Upstream commit 724a93a9f6033800b02a3530dbcb464638448e7f ]
-
-Convert the imports to use the "kernel vertical" imports style [1].
-
-No functional changes intended.
-
-Link: https://docs.kernel.org/rust/coding-guidelines.html#imports [1]
-Reviewed-by: Gary Guo <gary@garyguo.net>
-Link: https://patch.msgid.link/20260609104152.261145-1-ojeda@kernel.org
-Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-Stable-dep-of: 3fff4271809b ("rust: str: clean unused import for Rust >= 1.98")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- rust/kernel/str.rs | 24 +++++++++++++++++++-----
- 1 file changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs
-index 8311d91549e15e..a7fccd4c4f3b18 100644
---- a/rust/kernel/str.rs
-+++ b/rust/kernel/str.rs
-@@ -3,14 +3,28 @@
- //! String representations.
- 
- use crate::{
--    alloc::{flags::*, AllocError, KVec},
--    error::{to_result, Result},
--    fmt::{self, Write},
--    prelude::*,
-+    alloc::{
-+        flags::*,
-+        AllocError,
-+        KVec, //
-+    },
-+    error::{
-+        to_result,
-+        Result, //
-+    },
-+    fmt::{
-+        self,
-+        Write, //
-+    },
-+    prelude::*, //
- };
- use core::{
-     marker::PhantomData,
--    ops::{Deref, DerefMut, Index},
-+    ops::{
-+        Deref,
-+        DerefMut,
-+        Index, //
-+    }, //
- };
- 
- pub use crate::prelude::CStr;
--- 
-2.53.0
-

diff --git a/queue-7.1/series b/queue-7.1/series
index a5bba63087fb75b3e60dc85512209dd6982d7535..2b10839b9cb7627a6b9dff4597625e9905e71d30 100644 (file)
--- a/queue-7.1/series
+++ b/queue-7.1/series
@@ -1,5 +1,3 @@
 rust-str-use-the-kernel-vertical-imports-style.patch
 rust-str-clean-unused-import-for-rust-1.98.patch
 userfaultfd-gate-must_wait-writability-check-on-pte_.patch
-rust-str-use-the-kernel-vertical-imports-style.patch-28199
-rust-str-clean-unused-import-for-rust-1.98.patch-12096