summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@netfilter.org>2024-02-12 12:57:06 +0100
committerJozsef Kadlecsik <kadlec@netfilter.org>2024-02-12 12:57:06 +0100
commitdffbdff22523c31601307ed0c39e9f6362cf7bf9 (patch)
treecdfce961c6ad78c847d83ec3868bcd8fad695cbb
parent9926ba723d1183a0d1e08c9fc595c18240eae943 (diff)
ipset 7.21 releasedHEADv7.21master
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog8
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dabb22f..30012d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+7.21
+ - The patch "Fix hex literals in json output" broke save mode, restore it
+ - Fix -Werror=format-extra-args warning
+ - Workaround misleading -Wstringop-truncation warning
+
7.20
- Ignore *.order.cmd and *.symvers.cmd files in kernel builds
- Bash completion utility updated
diff --git a/configure.ac b/configure.ac
index 322c62b..db9e3f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [7.20], [kadlec@netfilter.org])
+AC_INIT([ipset], [7.21], [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 e7cd01a..1b05fbd 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,11 @@
+7.21
+ - netfilter: ipset: Suppress false sparse warnings
+ - tests: Verify module unload when sets with timeout were just destroyed
+ - netfilter: ipset: remove set destroy at ip_set module removal
+ - netfilter: ipset: Cleanup the code of destroy operation and explain
+ the two stages in comments
+ - netfilter: ipset: Missing gc cancellations fixed
+
7.20
- treewide: Convert del_timer*() to timer_shutdown*() (Steven Rostedt)
- Use timer_shutdown_sync() when available, instead of del_timer_sync()