Release v2.5.0.

diff --git a/ChangeLog b/ChangeLog
index c68417ee5201c789bc272c663443bd540cee1b80..7992f814ff650fa6d871b68889f7751ae51581d9 100644 (file)
--- 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 5b9c32d2706fd8de1842e26fefd0ccb00485f0e9..c55226d72a91bdd4e5c2f7c760668d3fa9121813 100644 (file)
--- 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 1c6e650cb941560479881ff1af9a4931f13c0cbb..eab73101e5b054e2fb6558a7d5c4b33ffbdc4587 100644 (file)
--- 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.