diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-10-27 19:38:37 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-10-27 19:38:37 +0100 |
| commit | c3ad11037681e46fb5f3096c5c824f3e3556522a (patch) | |
| tree | acbf9d1c1db37c73f2ad53d9ce0f16012abb3f9d | |
| parent | 1a1ae79398c1436963e549c7d1499b7fdda7a265 (diff) | |
ipset 6.20.1 releasedv6.20.1
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | kernel/ChangeLog | 11 |
3 files changed, 18 insertions, 1 deletions
@@ -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 c5f3770..228000b 100644 --- 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 1e1c82f..e07fa1a 100644 --- 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 |