ipset 7.6 released

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

diff --git a/ChangeLog b/ChangeLog
index 9a4bbf2b4d66ddd490f1f7bbfcd7986a0459db6b..ecb3d7f83fe30bf88eb5909ff611783bcffba8bf 100644 (file)
--- 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 2b8024898802cd0efd3239d5e27b2ca35c7cfe06..0167374554e5d580abdfa5cc1de0ffca9e3e3644 100644 (file)
--- 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 ec1eca570ad50f7f852adf40f6e5f969ae2cd480..a853ed4ca2e48908313a57d9105de730794006dd 100644 (file)
--- 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)