[kernel] disable drm-intel rebase

Kyle McMartin kyle at fedoraproject.org
Wed Nov 17 21:48:32 UTC 2010


commit 16ab22b5320d6df5f4eaae3ed419d2f9c713b284
Author: Kyle McMartin <kyle at mcmartin.ca>
Date:   Wed Nov 17 16:48:10 2010 -0500

    disable drm-intel rebase

 kernel.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index e70b1ba..d85d380 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 4
+%global baserelease 5
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -1267,9 +1267,9 @@ ApplyPatch fix_xen_guest_on_old_EC2.patch
 ApplyOptionalPatch drm-nouveau-updates.patch
 
 # Intel DRM
-ApplyPatch drm-intel-2.6.37-rc2.patch
-ApplyPatch drm-intel-big-hammer.patch
-ApplyPatch drm-intel-make-lvds-work.patch
+#ApplyPatch drm-intel-2.6.37-rc2.patch
+#ApplyPatch drm-intel-big-hammer.patch
+#ApplyPatch drm-intel-make-lvds-work.patch
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
 
 # linux1394 git patches
@@ -1955,6 +1955,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Wed Nov 17 2010 Kyle McMartin <kyle at redhat.com> 2.6.36-5
+- Disable drm/intel rebase until it can be fixed.
+
 * Wed Nov 17 2010 Kyle McMartin <kyle at redhat.com>
 - Make vmlinuz/System.map root read-write only by default. You can just
   chmod 644 them later if you (unlikely) need them without root.


More information about the scm-commits mailing list