summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile2
-rw-r--r--kernel/ChangeLog3
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c68417e..7992f81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2.5.0
+ - On parisc architecture cast increases required aligment (bugzilla
+ id 582), fixed.
+ - Respect LDFLAGS settings at compile time (Peter Volkov).
+
2.4.8
- In order to disable the extra warning flags, NO_EXTRA_WARN_FLAGS
variable added to userspace Makefile
diff --git a/Makefile b/Makefile
index 5b9c32d..c55226d 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ ifndef V
V=0
endif
-IPSET_VERSION:=2.4.9
+IPSET_VERSION:=2.5.0
PREFIX:=/usr/local
LIBDIR:=$(PREFIX)/lib
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index 1c6e650..eab7310 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,6 @@
+2.5.0
+ - Use the spinlock initiator instead of setting the locks directly
+ as it causes compilation errors with 2.6.29-rt (Jan Engelhardt).
2.4.9
- References to the old include file replaced with new one in order to
really use the new Jenkins' hash function.