summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac2
-rw-r--r--kernel/ChangeLog7
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f2248ef..b5a156d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+7.3
+ - ipset: fix spelling error in libipset.3 manpage (Neutron Soutmun)
+
7.2
- Update my email address
diff --git a/configure.ac b/configure.ac
index c7260bd..75f43c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Boilerplate
-AC_INIT([ipset], [7.2], [kadlec@netfilter.org])
+AC_INIT([ipset], [7.3], [kadlec@netfilter.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index 533a994..6bc9eca 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,10 @@
+7.3
+ - Fix rename concurrency with listing
+ - ipset: Copy the right MAC address in bitmap:ip,mac and
+ hash:ip,mac sets (Stefano Brivio)
+ - ipset: Actually allow destination MAC address for hash:ip,mac
+ sets too (Stefano Brivio)
+
7.2
- Update my email address
- ipset: Fix memory accounting for hash types on resize (Stefano Brivio)