summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog4
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index dd587c1..1acc976 100644
--- 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 8262b9c..0ee716d 100644
--- 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