ipset 6.33 released

diff --git a/ChangeLog b/ChangeLog
index e3fae1e4dbf7f9f065599cadaf6445507cfe12f6..e72523d4c9ad46fa703fe2738314a4ec9173e498 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+6.33
+  - Report if the option is supported by a newer kernel release
+  - ipset: Fix ipset command replacement in runtest.sh (Neutron Soutmun)
+  - Correct a test: number of entries may be outdated
+
 6.32
   - Fix possible truncated output in ipset output buffer handling
     (Reported by Omri Bahumi and Yoni Lavi).

diff --git a/configure.ac b/configure.ac
index d88d5b99733fcb3679199a1025b46e5a9ac7f155..5490e36f003f2332fa6030d3f19a4471d83f3071 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [6.32], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.33], [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 08d04ab04a5a9d3b1e3f09d6d23c681125894f79..0ed10aeb0ab251d5c2f46e98f5f81df4a38a46a2 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,22 @@
+6.33
+  - Backport patch: sctp: remove the typedef sctp_sctphdr_t
+  - Backport patch: netfilter: nfnetlink: extended ACK reporting
+  - ipset: remove unused function __ip_set_get_netlink (Aaron Conole)
+  - Backport patch: netlink: pass extended ACK struct to parsing functions
+  - Backport patch netlink: extended ACK reporting
+  - netfilter: Remove exceptional & on function name (Arushi Singhal)
+  - Backport missing part of patch: netfilter: Remove unnecessary cast on
+    void pointer
+  - Backport nfnl_msg_type()
+  - netfilter: ipset: ipset list may return wrong member count for set with
+    timeout (Vishwanath Pai)
+  - netfilter: ipset: deduplicate prefixlen maps (Aaron Conole)
+  - Fix sparse warnings
+  - netfilter: ipset: Compress return logic (simran singhal)
+  - netfilter: ipset: Remove unnecessary cast on void pointer (simran
+    singhal)
+  - Compatibility: handle changes in 4.10 kernel tree
+
 6.31
   - netfilter: ipset: Null pointer exception in ipset list:set
     (Vishwanath Pai)