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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-07-19 06:18:43 +0200 (Tue, 19 Jul 2011)
New Revision: 6316

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


Modified: pve-kernel-2.6.32-rh/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32-rh/trunk/Makefile	2011-07-19 04:17:32 UTC (rev 6315)
+++ pve-kernel-2.6.32-rh/trunk/Makefile	2011-07-19 04:18:43 UTC (rev 6316)
@@ -136,7 +136,7 @@
 	cd ${KERNEL_SRC}; patch -p1 <../SCSI-aacraid-Add-PMC-Sierra-SRC-based-controller.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 <../ovz-fix-slow-fsync.patch
+	#cd ${KERNEL_SRC}; patch -p1 <../ovz-fix-slow-fsync.patch
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	touch $@
 

Modified: pve-kernel-2.6.32-rh/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-07-19 04:17:32 UTC (rev 6315)
+++ pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-07-19 04:18:43 UTC (rev 6316)
@@ -1,6 +1,8 @@
 pve-kernel-2.6.32 (2.6.32-37) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab021.1.src.rpm
+  
+  * remove ovz-fix-slow-fsync.patch (already in upstream)
 
  -- Proxmox Support Team <support at proxmox.com>  Tue, 19 Jul 2011 06:06:48 +0200