summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog20
3 files changed, 27 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index af99386..ebf8771 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+6.30
+ - Drop extra comma from error message (Neutron Soutmun)
+ - Fix the incorrect dynamic/static modules list (Neutron Soutmun)
+ - Correct tests to check the number of entries too
+ - hash:ipmac type support added to ipset, userspace part (Tomasz Chilinski)
+
6.29
- Suppress unnecessary stderr in command loop for resize and list
- Correction in comment test
diff --git a/configure.ac b/configure.ac
index 538b6f4..432c108 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.29], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.30], [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 8ee92c6..60b300b 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,23 @@
+6.30
+ - netfilter: ipset: hash: fix boolreturn.cocci warnings
+ (Fengguang Wu)
+ - Fix the nla_put_net64() API changes backport
+ - netfilter: ipset: Fixing unnamed union init (Elad Raz)
+ - netfilter: x_tables: Use par->net instead of computing from the passed
+ net devices (Eric W. Biederman)
+ - Correct the reported memory size for bitmap:* types
+ - Fix coding styles reported by checkpatch.pl, already in kernel
+ - netfilter: x_tables: Pass struct net in xt_action_param
+ (Eric W. Biederman)
+ - net: sched: fix skb->protocol use in case of accelerated vlan path
+ (Jiri Pirko)
+ - Check IPSET_ATTR_ETHER netlink attribute length in hash:ipmac too
+ - netfilter: fix include files for compilation (Mikko Rapeli)
+ - ipset: Backports for the nla_put_net64() API changes (Neutron Soutmun)
+ - netfilter: ipset: use setup_timer() and mod_timer().
+ (Muhammad Falak R Wani)
+ - hash:ipmac type support added to ipset (Tomasz Chilinski)
+
6.29
- Fix race condition in ipset save, swap and delete (Vishwanath Pai)