ipset 6.25.1 released

diff --git a/ChangeLog b/ChangeLog
index 57d88c89bbc48878c96ce71a6347120cb9f727a4..8078a0f69246da10cb541e75e34ecb3419c747f6 100644 (file)
--- 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 c6222c24dba211c4318aa4e0371f2c562d9d3ea2..5ea2e3669f41189e43b9fa537dede752ee6bc353 100644 (file)
--- 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 2f3f04be2295aeab55eb2b7711c745413c38e38f..f8b25f73e338a28e0ecb1748f0cbb3a1e6dae646 100644 (file)
--- 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)