ipset 6.14 released

diff --git a/ChangeLog b/ChangeLog
index 3a04cfbb13a722915cc47151a260870cbbd73bc6..943ef8a2967af07e6e752cd903d9d5fd4ae2ffc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+6.14
+ - Support to match elements marked with "nomatch" in hash:*net* sets
+ - Coding style fixes
+ - The set type revision number is added to the header part of listing
+ - Help prints list type revision and terse description
+ - Add /0 network support to hash:net,iface type
+ - Fix errors when compiling in debug mode (Krunal Patel)
+ - Make sure IPPROTO_UDPLITE is defined
+ - build: restore -version-info (Jan Engelhardt)
+
 6.13
  - Explain in more detail src/dst for hash:net,iface
  - ipset help lists set types multiple times, fixed 

diff --git a/configure.ac b/configure.ac
index 7408c2879d4f693020cfb2c0d91ffb5cdf1ca36c..7e648fd9e504685c8742827beb9eb766eaad026d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Boilerplate
-AC_INIT([ipset], [6.13], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.14], [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 d27f81613bb7a6c045fc4b70022af6b9089782ea..7d016eb5aa2910bf5316e55b0e6e08e8e87924f7 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,14 @@
+6.14
+ - Support to match elements marked with "nomatch" in hash:*net* sets
+ - Coding style fixes
+ - Include supported revisions in module description
+ - Add /0 network support to hash:net,iface type
+ - Fix cidr book keeping for hash:*net* types
+ - Check and reject crazy /0 input parameters
+ - Backport ether_addr_equal
+ - Coding style fix, backport from kernel
+ - net: cleanup unsigned to unsigned int (Eric Dumazet)
+
 6.13
  - ipset: Handle properly an IPSET_CMD_NONE (Tomasz Bursztyka)
  - netfilter: ipset: hash:net,iface: fix interface comparison (Florian