summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@netfilter.org>2019-11-01 16:13:11 +0100
committerJozsef Kadlecsik <kadlec@netfilter.org>2019-11-01 16:13:11 +0100
commit244ad85a3e69654b8ce800088b30e1b5f605bfb8 (patch)
tree05cae041d61b281c31bd757b4261acfa4fd33c1e
parentd2bf22865663c260c9eb4ca2cba63dbac9e258f9 (diff)
ipset 7.4 releasedHEADv7.4master
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
-rw-r--r--ChangeLog10
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog25
3 files changed, 36 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b5a156d..60d6acc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+7.4
+ - Fix compatibility support for netlink extended ACK and add
+ synchronize_rcu_bh() checking
+ - treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
+ (Thomas Gleixner)
+ - ipset: Add wildcard support to net,iface (Kristian Evensen)
+ - Sort naturally instead of textual sort (bugzilla #1369)
+ - Do not return with error at 'make modules_install' when modules
+ are not loaded (reported by Oskar Berggren)
+
7.3
- ipset: fix spelling error in libipset.3 manpage (Neutron Soutmun)
diff --git a/configure.ac b/configure.ac
index 5a0f18a..246110d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [7.3], [kadlec@netfilter.org])
+AC_INIT([ipset], [7.4], [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 6bc9eca..79e736e 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,28 @@
+7.4
+ - Fix nla_policies to fully support NL_VALIDATE_STRICT
+ - treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
+ (Thomas Gleixner)
+ - netfilter: remove unnecessary spaces (yangxingwu)
+ - ipset: Add wildcard support to net,iface (Kristian Evensen)
+ - ipset: Copy the right MAC address in hash:ip,mac IPv6 sets
+ (Stefano Brivio)
+ - netfilter: ipset: move ip_set_get_ip_port() to ip_set_bitmap_port.c.
+ (Jeremy Sowden)
+ - netfilter: ipset: move function to ip_set_bitmap_ip.c. (Jeremy Sowden)
+ - netfilter: ipset: make ip_set_put_flags extern. (Jeremy Sowden)
+ - netfilter: ipset: move functions to ip_set_core.c. (Jeremy Sowden)
+ - netfilter: ipset: move ip_set_comment functions from ip_set.h
+ to ip_set_core.c. (Jeremy Sowden)
+ - netfilter: ipset: remove inline from static functions in .c files.
+ (Jeremy Sowden)
+ - netfilter: ipset: add a coding-style fix to ip_set_ext_destroy.
+ (Jeremy Sowden)
+ - netfilter: added missing includes to a number of header-files.
+ (Jeremy Sowden)
+ - netfilter: inlined four headers files into another one. (Jeremy Sowden)
+ - netfilter: ipset: Fix an error code in ip_set_sockfn_get()
+ (Dan Carpenter)
+
7.3
- Fix rename concurrency with listing
- ipset: Copy the right MAC address in bitmap:ip,mac and