ipset 7.22 released

Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>

diff --git a/ChangeLog b/ChangeLog
index 30012d224f4769448dbb8384bab8175167496b60..8ba5a2e71fd41ffa94d52d381cb9733a855ea96d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+7.22
+  - ipset: fix json output format for IPSET_OPT_IP (Z. Liu)
+  - tests: add namespace test and take into account delayed
+    set removal at module remove
+  - Update autoconfig tools to build cleanly on Debian bookworm
+
 7.21
   - The patch "Fix hex literals in json output" broke save mode, restore it
   - Fix -Werror=format-extra-args warning

diff --git a/configure.ac b/configure.ac
index fa0e69689c44f0e94b9fd73946595d3fe3f9c6d9..af56c241b7a7ad6233bea69e747f7d0248ad1dab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset],[7.21],[kadlec@netfilter.org])
+AC_INIT([ipset],[7.22],[kadlec@netfilter.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index 1b05fbdc2da962ce642680b4c0ce9b8f3ccc9e1f..ce024168569b79d41d4366f362e0557244e167b7 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,12 @@
+7.22
+  - netfilter: ipset: Fix race between namespace cleanup and gc
+    in the list:set type
+  - netfilter: ipset: Add list flush to cancel_gc (Alexander Maltsev)
+  - Kill sched.h dependency on rcupdate.h (Kent Overstreet)
+  - Handle "netfilter: propagate net to nf_bridge_get_physindev" patch
+  - netfilter: propagate net to nf_bridge_get_physindev (Pavel Tikhomirov)
+  - Revert "netfilter: ipset: remove set destroy at ip_set module removal"
+
 7.21
   - netfilter: ipset: Suppress false sparse warnings
   - tests: Verify module unload when sets with timeout were just destroyed