summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@netfilter.org>2024-01-31 11:32:03 +0100
committerJozsef Kadlecsik <kadlec@netfilter.org>2024-01-31 11:32:03 +0100
commit6e0628256309b83cc88ea20da8d331304df52ca7 (patch)
treeb246c55b78da108caccdb8c3b831783f5fd032b0
parente3e60c19f4d1c299c299fa64d2163fdec502ffa4 (diff)
ipset 7.20 releasedv7.20
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog12
3 files changed, 20 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4cb08f6..dabb22f 100644
--- 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 5d4c655..322c62b 100644
--- 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 17e9127..e7cd01a 100644
--- 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)