ipset 6.35 released

diff --git a/ChangeLog b/ChangeLog
index a321a03ee5d8eea6069199b00b5e8d19bd5ba151..fb3f3fd8b12b5ec45aebe6013c6cf63c92d489c3 100644 (file)
--- 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 9b6d6054b177cf14daf6686bc214d030aa8eb1c9..3db0c069845e1bf33576de7e1ef8df97b9fe49ab 100644 (file)
--- 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 95fc7981b7831987d1ccbf07a0673df523fa890b..cad926b5b9bbe5085ebbfb6f7e4e647f7f011339 100644 (file)
--- 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)