ipset 7.20 released

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

diff --git a/ChangeLog b/ChangeLog
index 4cb08f6700548f2a649c5472e58f50984b335a56..dabb22fecea39f0a24745f18ed8076eb1af573a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+7.20
+  - Ignore *.order.cmd and *.symvers.cmd files in kernel builds
+  - Bash completion utility updated
+  - Fix json output for -name option (Mark)
+  - Fix hex literals in json output
+  - tests: increase timeout to cope with slow virtual test machine
+
 7.19
   - build: Fix the double-prefix in pkgconfig (Sam James)
 

diff --git a/configure.ac b/configure.ac
index 5d4c6550c6d817c7da2bf32d18ccd04b300dd520..322c62b24514e650e29821a20f55f50e3d595080 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [7.19], [kadlec@netfilter.org])
+AC_INIT([ipset], [7.20], [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 17e91271c8d90bd35282f2351426caf6806889eb..e7cd01a640a72cda6f63d72e01254fb7233efe42 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,15 @@
+7.20
+  - treewide: Convert del_timer*() to timer_shutdown*() (Steven Rostedt)
+  - Use timer_shutdown_sync() when available, instead of del_timer_sync()
+  - netfilter: ipset: fix race condition between swap/destroy and kernel
+    side add/del/test v4
+  - netfilter: ipset: fix race condition between swap/destroy and kernel
+    side add/del/test v3
+  - netfilter: ipset: fix race condition between swap/destroy and kernel
+    side add/del/test v2
+  - netfilter: ipset: fix race condition between swap/destroy and kernel
+    side add/del/test
+
 7.18
   - netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
     (reported by Kyle Zeng)