diff options
| author | Jozsef Kadlecsik <kadlec@netfilter.org> | 2024-06-05 08:37:43 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@netfilter.org> | 2024-06-05 08:37:43 +0200 |
| commit | a50abde9c959be364782c01c61429a951454f5ef (patch) | |
| tree | c242d458eaa751acca0941783ae58115ff1e502a | |
| parent | 776f37405da713d3d5ad3908dd9aee4f50c1b1f9 (diff) | |
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | kernel/ChangeLog | 9 |
3 files changed, 16 insertions, 1 deletions
@@ -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 fa0e696..af56c24 100644 --- 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 1b05fbd..ce02416 100644 --- 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 |