summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog5
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a5941ba..392b571 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+6.16
+ - Remove all modules before testing resize
+ - build: support for Linux 3.7 UAPI (Jan Engelhardt)
+
6.15
- Fix interactive mode (Fredrik Eriksson)
- Use gethostbyname2 instead of getaddrinfo
diff --git a/configure.ac b/configure.ac
index dea392d..f510bfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.15], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.16], [kadlec@blackhole.kfki.hu])
AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index 28c4a25..ac91939 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,8 @@
+6.16
+ - Netlink pid is renamed to portid in kernel 3.7.0
+ - Fix RCU handling when the number of maximal sets are increased
+ - netfilter: ipset: fix netiface set name overflow (Florian Westphal)
+
6.15
- Increase the number of maximal sets automatically as needed
- Restore the support of kernel versions between 2.6.32 and 2.6.35