summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@netfilter.org>2020-02-22 12:53:21 +0100
committerJozsef Kadlecsik <kadlec@netfilter.org>2020-02-22 12:53:21 +0100
commita2a846e09ab67202b11a4795de93130c85f51756 (patch)
tree622d8ff203bdd7df9d6b3da5ce3499d77f6222ba
parent33f388112b552e536c2d1cb75541f5b14448f05a (diff)
ipset 7.6 releasedv7.6region_lock
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog10
3 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a4bbf2..ecb3d7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+7.6
+ - Add checking system_power_efficient_wq in the kernel source tree
+ - .gitignore: add temporary files to the list
+
7.5
- configure.ac: Support building with old autoconf 2.63
(Serhey Popovych)
diff --git a/configure.ac b/configure.ac
index 2b80248..0167374 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [7.5], [kadlec@netfilter.org])
+AC_INIT([ipset], [7.6], [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 ec1eca5..a853ed4 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,13 @@
+7.6
+ - netfilter: ipset: Fix forceadd evaluation path
+ - netfilter: ipset: Correct the reported memory size
+ - ip_set: Include kernel header instead of UAPI (Serhey Popovych)
+ - netfilter: ipset: Fix "INFO: rcu detected stall in hash_xxx" reports
+ - netfilter: ipset: fix suspicious RCU usage in find_set_and_id
+ - Add compatibility support for bitmap_zalloc() and bitmap_zero()
+ - netfilter: ipset: use bitmap infrastructure completely
+ - netfilter: fix a use-after-free in mtype_destroy() (Cong Wang)
+
7.5
- netfilter: ipset: avoid null deref when IPSET_ATTR_LINENO is present
(Florian Westphal)