summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-03-04 17:03:21 -0500
committerKyle McMartin <kyle@redhat.com>2011-03-04 17:03:21 -0500
commit68c77e0c03c0e4936eab60219069345d85a9d267 (patch)
tree751195c1c637c64511bb79e2c24b3e6249e9c506
parent5554884073901304079f299c9170eeb1aa7469fe (diff)
downloadkernel-68c77e0c03c0e4936eab60219069345d85a9d267.tar.gz
kernel-68c77e0c03c0e4936eab60219069345d85a9d267.tar.xz
kernel-68c77e0c03c0e4936eab60219069345d85a9d267.zip
revert drm-i915-gen4-has-non-power-of-two-strides.patch for now
-rw-r--r--kernel.spec8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 2412807af..b8b00ff1c 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 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -1292,7 +1292,7 @@ ApplyPatch linux-2.6-intel-iommu-igfx.patch
ApplyPatch drm-intel-edp-fixes.patch
# rhbz#681285 (i965: crash in brw_wm_surface_state.c::prepare_wm_surfaces()
# where intelObj->mt == NULL)
-ApplyPatch drm-i915-gen4-has-non-power-of-two-strides.patch
+#ApplyPatch drm-i915-gen4-has-non-power-of-two-strides.patch
# linux1394 git patches
#ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1950,6 +1950,10 @@ fi
# and build.
%changelog
+* Fri Mar 04 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc7.git2.2
+- Disable drm-i915-gen4-has-non-power-of-two-strides.patch for now, breaks
+ my mutter.
+
* Fri Mar 04 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc7.git2.1
- Linux 2.6.38-rc7-git2
- drm-i915-gen4-has-non-power-of-two-strides.patch (#681285)