summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2017-02-19 18:52:52 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2017-02-19 18:52:52 +0100
commit816cc57a6f17b7abb8f2958f191ba26a0e21c708 (patch)
tree06c02f7a5a12965d050e585a0552fa63dbadd988
parent7077615b17085c8f7f50e4735a5204e8b25b1964 (diff)
ipset 6.31 releasedv6.31
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog8
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ebf8771..39644f1 100644
--- 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 432c108..c075e50 100644
--- 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 60b300b..08d04ab 100644
--- 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)