ipset 6.36 released

diff --git a/ChangeLog b/ChangeLog
index fb3f3fd8b12b5ec45aebe6013c6cf63c92d489c3..15a93e603d3cfdb70b3bcd45afe556cbd73b4129 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+6.36
+  - Use 'ss' in runtest.sh but fall back to deprecated 'net-tools'
+    command (bugzilla id #1209)
+  - build: do install libipset/args.h (Jan Engelhardt)
+  - Add test to verify wraparound fix
+
 6.35
   - Userspace revision handling is reworked
   - Replace the last reference to u_int8_t with uint8_t.

diff --git a/configure.ac b/configure.ac
index 3db0c069845e1bf33576de7e1ef8df97b9fe49ab..46c39b12087e17eee9ddc29751dfa7b08c4a59f2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [6.35], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.36], [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 cad926b5b9bbe5085ebbfb6f7e4e647f7f011339..703fb0c881e231b4b03a3dcb1e6cdd6811013c45 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,10 @@
+6.36
+  - Remove duplicate module description
+  - netfilter: remove messages print and boot/module load time
+    (Pablo Neira Ayuso)
+  - Fix wraparound bug introduced in commit 48596a8ddc46 in v6.34
+    (reported by Thomas Schwark)
+
 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