ipset 7.21 released

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

diff --git a/ChangeLog b/ChangeLog
index dabb22fecea39f0a24745f18ed8076eb1af573a6..30012d224f4769448dbb8384bab8175167496b60 100644 (file)
--- 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 322c62b24514e650e29821a20f55f50e3d595080..db9e3f828e87cd1e6a4806b6f9daebb05ea73b60 100644 (file)
--- 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 e7cd01a640a72cda6f63d72e01254fb7233efe42..1b05fbdc2da962ce642680b4c0ce9b8f3ccc9e1f 100644 (file)
--- 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()