summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2018-01-06 17:00:25 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2018-01-06 17:00:25 +0100
commitb1b217c885e1ad36d0b0a5a83fc1900e3a6d71ed (patch)
tree5fa0ed4954110d92f78342969a507fbd833121f6
parenteb3d408ce943d364a53173f61da8c9d899aa129a (diff)
ipset 6.35 releasedv6.35
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog17
3 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a321a03..fb3f3fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+6.35
+ - Userspace revision handling is reworked
+ - Replace the last reference to u_int8_t with uint8_t.
+
6.34
- testsuite: Make sure it can be run over ssh :-)
- Reset state after a command failed, when multiple ones are issued
diff --git a/configure.ac b/configure.ac
index 9b6d605..3db0c06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.34], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.35], [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 95fc798..cad926b 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,20 @@
+6.35
+ - netfilter: mark expected switch fall-throughs (Gustavo A. R. Silva)
+ - License cleanup: add SPDX GPL-2.0 license identifier to files with no
+ license (Greg Kroah-Hartman)
+ - Backport patch: netfilter: ipset: use nfnl_mutex_is_locked
+ - Missing nfnl_lock()/nfnl_unlock() is added to ip_set_net_exit()
+ - netfilter: ipset: use nfnl_mutex_is_locked (Florian Westphal)
+ - netfilter: ipset: add resched points during set listing
+ (Florian Westphal)
+ - Fix "don't update counters" mode when counters used at the matching
+ - Backport patch: netfilter: ipset: Convert timers to use timer_setup()
+ - netfilter: ipset: use swap macro instead of _manually_ swapping values
+ (Gustavo A. R. Silva)
+ - netfilter: ipset: Fix race between dump and swap (Ross Lagerwall)
+ - netfilter: ipset: pernet ops must be unregistered last (Florian
+ Westphal)
+
6.34
- Fix adding an IPv4 range containing more than 2^31 addresses
(bugzilla id #1005, reported by Oleg Serditov and Oliver Ford)