ipset 7.15 released

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

diff --git a/configure.ac b/configure.ac
index dd587c1b85e8aa907a398eff79a26e22794945f3..1acc9762952779a2c800ae5d92cb30cd4c034de7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [7.14], [kadlec@netfilter.org])
+AC_INIT([ipset], [7.15], [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 8262b9cdb39950e2519532c0f6bde0bbb9b985fd..0ee716d1e7d78e849a26aec640a7810075aba511 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,7 @@
+7.15
+  - netfilter: ipset: Fix maximal range check in hash_ipportnet4_uadt()
+    (Nathan Chancellor)
+
 7.14
   - 64bit division isn't allowed on 32bit, replace it with shift