summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-09-06 21:12:17 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-09-06 21:12:17 +0200
commitc18c7e8b5d75b30f0f2cbb7b1a9d90905eb135ed (patch)
tree646c413316eecf052ed6d9fc07dd3c10feee72fa
parent55d2148f8737cd1d1fa1f166d96dcdb26161f5ec (diff)
ipset 6.9 releasedv6.9
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog12
3 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f642d44..85a9e2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+6.9
+ - build: move ipset_errcode into library (Jan Engelhardt)
+ - build: abort autogen on subcommand failure (Jan Engelhardt)
+ - ipset: use NFPROTO_ constants (Jan Engelhardt)
+ - Propagate "expose userspace-relevant parts in ip_set.h" to ipset source
+
6.8
- Update the manpage and document the limits in hash:net,iface.
- README file corrections from Richard Lucassen
diff --git a/configure.ac b/configure.ac
index 0e92b1a..2c5d1b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.8], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.9], [kadlec@blackhole.kfki.hu])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER([config.h])
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index 00fdf30..15d5194 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,15 @@
+6.9
+ - Complete Kconfig with hash:net,iface type (standalone package)
+ - rtnetlink: Compute and store minimum ifinfo dump size (Greg Rose)
+ - Remove redundant linux/version.h includes from net/ (Jesper Juhl)
+ - ipset: use NFPROTO_ constants (Jan Engelhardt)
+ - netfilter: ipset: expose userspace-relevant parts in ip_set.h
+ (Jan Engelhardt)
+ - netfilter: ipset: avoid use of kernel-only types (Jan Engelhardt)
+ - netfilter: Remove unnecessary OOM logging messages (Joe Perches)
+ - Dumping error triggered removing references twice and lead to kernel BUG
+ - Autoload set type modules safely
+
6.8
- Fix compiler warnings "'hash_ip4_data_next' declared inline after being
called" (Chris Friesen)