summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog16
3 files changed, 35 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f95c73b..1521cb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+6.21
+ - ipset: add userspace support for forceadd (Josh Hunt)
+ - kernel: uapi: fix MARKMASK attr ABI breakage (Florian Westphal)
+ - lib: fix ifname 'physdev:' prefix parsing (Florian Westphal)
+ - Prepare the kernel for create option flags when no extension is needed
+ - print mark & mark mask in hex rather then decimal (Vytas Dauksa)
+ - add markmask for hash:ip,mark data type (Vytas Dauksa)
+ - add hash:ip,mark data type to ipset (Vytas Dauksa)
+ - ipset: manpage: correct add action synopsis for hash:net,port,net.
+ (Mart Frauenlob)
+ - ipset: manpage: remove spare comma for hash:net,net test action.
+ (Mart Frauenlob)
+ - Fix all set output from list/save when set with counters in use.
+ (Sergey Popovich)
+ - ipset: Fix malformed output from list/save for ICMP types in port field
+ (Sergey Popovich)
+ - ipset: fix timeout data type size (Nikolay Martynov)
+
6.20.1
- build: fix incorrect library versioning (Jan Engelhardt)
- netfilter: ipset: Fix configure failure when --with-kmod=no
diff --git a/configure.ac b/configure.ac
index b886778..45129c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.20.1], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.21], [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 e07fa1a..25b4e3a 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,19 @@
+6.21
+ - ipset: add forceadd kernel support for hash set types (Josh Hunt)
+ - netfilter: ipset: move registration message to init from net_init
+ (Ilia Mirkin)
+ - kernel: uapi: fix MARKMASK attr ABI breakage (Florian Westphal)
+ - Prepare the kernel for create option flags when no extension is needed
+ - add markmask for hash:ip,mark data type (Vytas Dauksa)
+ - add hash:ip,mark data type to ipset (Vytas Dauksa)
+ - ipset: remove unused code (Stephen Hemminger)
+ - netfilter: ipset: Add hash: fix coccinelle warnings (Fengguang Wu)
+ - Typo in ip_set_hash_netnet.c fixed (David Binderman)
+ - net ipset: use rbtree postorder iteration instead of opencoding
+ (Cody P Schafer)
+ - ipset: Follow manual page behavior for SET target on list:set
+ (Sergey Popovich)
+
6.20.1
- netfilter: ipset: remove duplicate define (Michael Opdenacker)
- net->user_ns is available starting from 3.8, add compatibility