ipset 6.31 released

diff --git a/ChangeLog b/ChangeLog
index ebf87714fc663c370480efee21e6eee46a5f03bc..39644f1094113accb1b1f42d98cc2d343928a449 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+6.31
+  - Update manpage about the size parameter of list:set types.
+  - New test to verify that only the intended entries are deleted at hash
+    types.
+
 6.30
   - Drop extra comma from error message (Neutron Soutmun)
   - Fix the incorrect dynamic/static modules list (Neutron Soutmun)

diff --git a/configure.ac b/configure.ac
index 432c108d7137273a50650ce006b03255f15a3065..c075e5055644e96605c830aaf10d9584bffad282 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [6.30], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.31], [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 60b300b92ac200259fcc9d92b29c8e259479f3dc..08d04ab04a5a9d3b1e3f09d6d23c681125894f79 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,11 @@
+6.31
+  - netfilter: ipset: Null pointer exception in ipset list:set
+    (Vishwanath Pai)
+  - Fix bug: sometimes valid entries in hash:* types of sets were evicted
+    (reported by Eric Ewanco)
+  - Correct copyright owner
+  - Revert patch "Correct rcu_dereference_bh_nfnl() usage"
+
 6.30
   - netfilter: ipset: hash: fix boolreturn.cocci warnings
     (Fengguang Wu)