remove fix-nfs-block-count.patch (now upstream)

diff --git a/Makefile b/Makefile
index c9c2135cf417241ded9ca7c8f0d2c68e2df7b532..09dfd5a694bfcb95f73a41f649278e62078bb871 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -166,7 +166,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
        cd ${KERNEL_SRC}; patch -p1 <../kbuild-generate-mudules-builtin.patch
        cd ${KERNEL_SRC}; patch -p1 <../add-tiocgdev-ioctl.patch
-       cd ${KERNEL_SRC}; patch -p1 <../fix-nfs-block-count.patch
+       #cd ${KERNEL_SRC}; patch -p1 <../fix-nfs-block-count.patch
        cd ${KERNEL_SRC}; patch -p1 <../fix-idr-header-for-drbd-compilation.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@

diff --git a/changelog.Debian b/changelog.Debian
index 2caa7d4eff6973fb673f5f745aed6bc7e225fd10..1c985a6febea1f06acfa840838adb82a1d107240 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,6 +1,8 @@
 pve-kernel-2.6.32 (2.6.32-117) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab084.12.src.rpm 
+  
+  * remove fix-nfs-block-count.patch (now upstream)
 
   * update netxtreme2 to 7.8.56