[pve-devel] r6399 - pve-kernel-2.6.32/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-03 07:20:15 +0200 (Wed, 03 Aug 2011)
New Revision: 6399

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


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2011-08-03 05:15:53 UTC (rev 6398)
+++ pve-kernel-2.6.32/trunk/Makefile	2011-08-03 05:20:15 UTC (rev 6399)
@@ -149,7 +149,7 @@
 	zcat ${KERNEL_DEB_DIFF}|patch -p1 -d ${KERNEL_SRC}
 	cd ${KERNEL_SRC}; patch -p1 <../revert-2.6.32.40-kvm-clock-fixes.patch
 	./applydebpatches.pl ${KERNEL_SRC} ${KERNEL_DEB_REL}
-	cd ${KERNEL_SRC}; patch -p1 <../fix-register-corruption-in-pvclock-scale-delta.patch
+	#cd ${KERNEL_SRC}; patch -p1 <../fix-register-corruption-in-pvclock-scale-delta.patch
 	#cd ${KERNEL_SRC}; patch -p1 <../use-init-task-credential.patch
 	cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31.patch 
 	cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2011-08-03 05:15:53 UTC (rev 6398)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2011-08-03 05:20:15 UTC (rev 6399)
@@ -2,7 +2,8 @@
 
   * update e1000e to 1.4.4
   
-  * revert buggy kvm clock changes introduced by 2.6.32.40 patch
+  * revert buggy kvm clock changes introduced by 2.6.32.40 patch (also
+  remove fix-register-corruption-in-pvclock-scale-delta.patch)
 
  -- Proxmox Support Team <support at proxmox.com>  Wed, 03 Aug 2011 06:52:49 +0200