[pve-devel] r6546 - pve-kernel-2.6.32-rh/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-09-19 06:32:34 +0200 (Mon, 19 Sep 2011)
New Revision: 6546

Modified:
   pve-kernel-2.6.32-rh/trunk/Makefile
   pve-kernel-2.6.32-rh/trunk/README
   pve-kernel-2.6.32-rh/trunk/changelog.Debian
Log:
cleanup


Modified: pve-kernel-2.6.32-rh/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32-rh/trunk/Makefile	2011-09-19 04:18:46 UTC (rev 6545)
+++ pve-kernel-2.6.32-rh/trunk/Makefile	2011-09-19 04:32:34 UTC (rev 6546)
@@ -137,7 +137,6 @@
 	cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31-rh.patch
 	cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab037
 	cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
-	cd ${KERNEL_SRC}; patch -p1 <../fix-register-corruption-in-pvclock-scale-delta.patch
 	cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
 	cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'

Modified: pve-kernel-2.6.32-rh/trunk/README
===================================================================
--- pve-kernel-2.6.32-rh/trunk/README	2011-09-19 04:18:46 UTC (rev 6545)
+++ pve-kernel-2.6.32-rh/trunk/README	2011-09-19 04:32:34 UTC (rev 6546)
@@ -23,14 +23,6 @@
 
   * ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/DRIVER/SourceCode/arcmsr.1.20.0X.15-110330.zip
 
-- include latest broadcom bnx2 drivers
-        
-  * original file linux-6.2.23.zip contains
-    netxtreme2-6.2.23.tar.gz (added to repository)
-
-  NOTE: we do not install the bnx2x driver, because it does not compile
-  with recent kernels
-
 - include ISCSITARGET driver found at:
 
   * http://iscsitarget.sourceforge.net/

Modified: pve-kernel-2.6.32-rh/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-09-19 04:18:46 UTC (rev 6545)
+++ pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-09-19 04:32:34 UTC (rev 6546)
@@ -1,6 +1,9 @@
 pve-kernel-2.6.32 (2.6.32-45) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab037.1.src.rpm
+
+  * remove fix-register-corruption-in-pvclock-scale-delta.patch (now in
+    upstream)
   
   * use bnx2 from upstream