summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2015-06-25 11:19:08 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2015-06-25 11:19:08 +0200
commitef8aa19f614cf9a36bb37f3db9c6711e0d39e5c8 (patch)
tree1bf8db8ad8fd04550e85007d411aa08b450ddaf5
parent6d9aea927fba2691dd61ec6b58a21784ff3e8f0e (diff)
ipset 6.25.1 releasedv6.25.1
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog4
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 57d88c8..8078a0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+6.25.1
+ - ipset manpage: refer to iptables-extensions
+ - Update userspace header file from the kernel tree
+ - Handle 'extern "C" {' in check_libmap.sh
+
6.25
- Add element count to all set types header
- Add element count to hash headers (Eric B Munson)
diff --git a/configure.ac b/configure.ac
index c6222c2..5ea2e36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.25], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.25.1], [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 2f3f04b..f8b25f7 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,7 @@
+6.25.1
+ - net/netfilter/ipset: work around gcc-4.4.4 initializer bug
+ (Andrew Morton)
+
6.25
- Add element count to all set types header
- Add element count to hash headers (Eric B Munson)