[DRBD-cvs] r1798 - in branches/drbd-0.7: . drbd/linux

[www-data]

Author: lars
Date: 2005-05-23 15:23:33 +0200 (Mon, 23 May 2005)
New Revision: 1798

Modified:
   branches/drbd-0.7/ChangeLog
   branches/drbd-0.7/drbd.spec.in
   branches/drbd-0.7/drbd/linux/drbd_config.h
Log:

prepare release 0.7.11


Modified: branches/drbd-0.7/ChangeLog
===================================================================
--- branches/drbd-0.7/ChangeLog	2005-05-12 12:48:43 UTC (rev 1797)
+++ branches/drbd-0.7/ChangeLog	2005-05-23 13:23:33 UTC (rev 1798)
@@ -1,6 +1,6 @@
 Latest:
 ------
- ChangeLog last updated: r1778 2005-05-09
+ ChangeLog last updated: r1798 2005-05-23
  Cumulative changes since last tarball.
  For even more detail, use "svn log" and "svn diff".
 

Modified: branches/drbd-0.7/drbd/linux/drbd_config.h
===================================================================
--- branches/drbd-0.7/drbd/linux/drbd_config.h	2005-05-12 12:48:43 UTC (rev 1797)
+++ branches/drbd-0.7/drbd/linux/drbd_config.h	2005-05-23 13:23:33 UTC (rev 1798)
@@ -22,7 +22,7 @@
 
 extern const char * drbd_buildtag(void);
 
-#define REL_VERSION "0.7.10"
+#define REL_VERSION "0.7.11"
 #define API_VERSION 77
 #define PRO_VERSION 74
 

Modified: branches/drbd-0.7/drbd.spec.in
===================================================================
--- branches/drbd-0.7/drbd.spec.in	2005-05-12 12:48:43 UTC (rev 1797)
+++ branches/drbd-0.7/drbd.spec.in	2005-05-23 13:23:33 UTC (rev 1798)
@@ -51,6 +51,8 @@
 #Release: %{release}_%{krelver}
 Group: System Environment/Kernel
 Requires: %{name} = %{version}, /sbin/depmod
+# conflicts with the suse km_drbd package. use either theirs, or ours... 
+Conflicts: km_drbd
 #%{?ksmp:Provides: kernel-module-drbd = %{version}-%{release}_%{krelver}}
 
 #%description -n kernel%{?ksmp}-module-drbd
@@ -137,6 +139,12 @@
 %doc drbd/k-config-%{kernelversion}.gz
 
 %post
+# hack for distribution kernel packages,
+# which already contain some (probably outdated) drbd module
+EXTRA_DRBD_KO=/lib/modules/%{kernelversion}/extra/drbd.ko
+if test -e $EXTRA_DRBD_KO; then
+	mv $EXTRA_DRBD_KO $EXTRA_DRBD_KO.orig
+fi
 chkconfig --add drbd
 
 for i in `seq 0 15` ; do 
@@ -171,6 +179,18 @@
 /sbin/depmod -a -F /boot/System.map-%{kernelversion} %{kernelversion} >/dev/null 2>&1 || true
 
 %changelog
+* Mon May 23 2005 15:11:39 +0200 Lars Ellenberg <lars at linbit.com>
+- drbd (0.7.11-1)
+ * The upper limit of the runtime tuning parameter max_buffers 
+   was ways too low for today's IBM storage controllers. 
+   Was 32 - 10000 ; Now it is 32 - 131072 ( Now one could 
+   allow DRBD to allocate up to half a gigabyte of memory as 
+   receive buffers)
+ * A fix to the Makefiles to make building of RPMs work on RAHS4.
+ * A workaround to have DBRD running on PPC64 with Linux-2.4.x kernels,
+   on Linux-2.6.x everything was fine already.
+ * Removal of dead code (busy_blocks).
+
 * Mon Jan 31 2005 10:17:00 +0200 Philipp Reisner <phil at linbit.com>
 - drbd (0.7.10-1)
  * 0.7.9 had a memory corruption bug and memory leakage (BIOs).