From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Thu, 25 Jun 2015 09:19:08 +0000 (+0200)
Subject: ipset 6.25.1 released
X-Git-Tag: v6.25.1^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef8aa19f614cf9a36bb37f3db9c6711e0d39e5c8;p=thirdparty%2Fipset.git

ipset 6.25.1 released
---

diff --git a/ChangeLog b/ChangeLog
index 57d88c89..8078a0f6 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 c6222c24..5ea2e366 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 2f3f04be..f8b25f73 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)