summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog4
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 15a93e6..7245984 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+6.37
+ - Fix parsing service names for ports (reported by Yuri D'Elia)
+
6.36
- Use 'ss' in runtest.sh but fall back to deprecated 'net-tools'
command (bugzilla id #1209)
diff --git a/configure.ac b/configure.ac
index 46c39b1..ce9aed2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [6.36], [kadlec@blackhole.kfki.hu])
+AC_INIT([ipset], [6.37], [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 703fb0c..3c7fbdc 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,7 @@
+6.37
+ - netfilter: ipset: Use is_zero_ether_addr instead of static and memcmp
+ (Joe Perches)
+
6.36
- Remove duplicate module description
- netfilter: remove messages print and boot/module load time