ipset 6.20.1 released

diff --git a/ChangeLog b/ChangeLog
index 64af939c84c16b87722c224041a1806e34afb440..f95c73ba3f62587ff6ee8eefa2e394c75f2e5ed1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+6.20.1
+  - build: fix incorrect library versioning (Jan Engelhardt)
+  - netfilter: ipset: Fix configure failure when --with-kmod=no
+    (Oliver Smith)
+  - Avoid clashing with configured kernel in [CONFIG_]IP_SET_MAX
+
 6.20
   - Missing comment support added to hash:ip,port,ip and hash:net,iface
     types

diff --git a/configure.ac b/configure.ac
index c5f3770ffac21b0dc14f2330a3def1000b8df127..228000ba8e4b0655e79550798999b6c8a8dcd7b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [6.20], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.20.1], [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 1e1c82fbd725a2365cf2dc711312f1fe83cb12ae..e07fa1a23434212018f539408c3f30a572cd37e9 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,14 @@
+6.20.1
+  - netfilter: ipset: remove duplicate define (Michael Opdenacker)
+  - net->user_ns is available starting from 3.8, add compatibility
+    checking (reported by Jan Engelhardt)
+  - Fix memory allocation for bitmap:port (reported by Quentin Armitage)
+  - Avoid clashing with configured kernel in [CONFIG_]IP_SET_MAX
+  - The unnamed union initialization may lead to compilation error
+    (reported by Husnu Demir)
+  - Use dev_net() instead of the direct access to ->nd_net (reported by
+    the kbuild test robot)
+
 6.20
   - Compatibility code is modified not to rely on kernel version numbers
   - Use netlink callback dump args only