commit:     d5a192d169581a110c459015458cd32d77fcb94c
Author:     Arisu Tachibana <alicef <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  4 13:09:52 2026 +0000
Commit:     Arisu Tachibana <alicef <AT> gentoo <DOT> org>
CommitDate: Wed Mar  4 13:09:52 2026 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=d5a192d1

Linux patch 6.19.5

Signed-off-by: Arisu Tachibana <alicef <AT> gentoo.org>

 0000_README             |  4 +++
 1004_linux-6.19.5.patch | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/0000_README b/0000_README
index 30ce730d..6fe46a79 100644
--- a/0000_README
+++ b/0000_README
@@ -59,6 +59,10 @@ Patch:  1003_linux-6.19.4.patch
 From:   https://www.kernel.org
 Desc:   Linux 6.19.4
 
+Patch:  1004_linux-6.19.5.patch
+From:   https://www.kernel.org
+Desc:   Linux 6.19.5
+
 Patch:  1510_fs-enable-link-security-restrictions-by-default.patch
 From:   
http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/
 Desc:   Enable link security restrictions by default.

diff --git a/1004_linux-6.19.5.patch b/1004_linux-6.19.5.patch
new file mode 100644
index 00000000..9c322dde
--- /dev/null
+++ b/1004_linux-6.19.5.patch
@@ -0,0 +1,67 @@
+diff --git a/Makefile b/Makefile
+index e9396657c546d5..f486050e0bee49 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 6
+ PATCHLEVEL = 19
+-SUBLEVEL = 4
++SUBLEVEL = 5
+ EXTRAVERSION =
+ NAME = Baby Opossum Posse
+ 
+diff --git a/include/net/netfilter/nf_tables.h 
b/include/net/netfilter/nf_tables.h
+index 7eac73f9b4ce34..05f57ba6224476 100644
+--- a/include/net/netfilter/nf_tables.h
++++ b/include/net/netfilter/nf_tables.h
+@@ -456,6 +456,7 @@ struct nft_set_ext;
+  *    @init: initialize private data of new set instance
+  *    @destroy: destroy private data of set instance
+  *    @gc_init: initialize garbage collection
++ *    @abort_skip_removal: skip removal of elements from abort path
+  *    @elemsize: element private size
+  *
+  *    Operations lookup, update and delete have simpler interfaces, are faster
+@@ -513,6 +514,7 @@ struct nft_set_ops {
+                                                  const struct nft_set *set);
+       void                            (*gc_init)(const struct nft_set *set);
+ 
++      bool                            abort_skip_removal;
+       unsigned int                    elemsize;
+ };
+ 
+diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
+index 8dae197c7fafb5..3b9c559ab1232a 100644
+--- a/net/netfilter/nf_tables_api.c
++++ b/net/netfilter/nf_tables_api.c
+@@ -7702,7 +7702,8 @@ static bool nft_trans_elems_new_abort(const struct 
nft_ctx *ctx,
+                       continue;
+               }
+ 
+-              if (!te->set->ops->abort || nft_setelem_is_catchall(te->set, 
te->elems[i].priv))
++              if (!te->set->ops->abort_skip_removal ||
++                  nft_setelem_is_catchall(te->set, te->elems[i].priv))
+                       nft_setelem_remove(ctx->net, te->set, 
te->elems[i].priv);
+ 
+               if (!nft_setelem_is_catchall(te->set, te->elems[i].priv))
+diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
+index 6d77a5f0088ad0..18e1903b1d3d0b 100644
+--- a/net/netfilter/nft_set_pipapo.c
++++ b/net/netfilter/nft_set_pipapo.c
+@@ -2370,6 +2370,7 @@ const struct nft_set_type nft_set_pipapo_type = {
+               .gc_init        = nft_pipapo_gc_init,
+               .commit         = nft_pipapo_commit,
+               .abort          = nft_pipapo_abort,
++              .abort_skip_removal = true,
+               .elemsize       = offsetof(struct nft_pipapo_elem, ext),
+       },
+ };
+@@ -2394,6 +2395,7 @@ const struct nft_set_type nft_set_pipapo_avx2_type = {
+               .gc_init        = nft_pipapo_gc_init,
+               .commit         = nft_pipapo_commit,
+               .abort          = nft_pipapo_abort,
++              .abort_skip_removal = true,
+               .elemsize       = offsetof(struct nft_pipapo_elem, ext),
+       },
+ };

Reply via email to