summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-05-31 15:08:31 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-05-31 15:08:31 -0400
commit7452d27e96b9986a5e20b87e70fc84b58f394f81 (patch)
tree9b1dbb7dde68b30f32caae055e5717d29a2b2f25 /kernel.spec
parent83b52db10b98155a62c232255a1172436b223d69 (diff)
downloadkernel-7452d27e96b9986a5e20b87e70fc84b58f394f81.tar.gz
kernel-7452d27e96b9986a5e20b87e70fc84b58f394f81.tar.xz
kernel-7452d27e96b9986a5e20b87e70fc84b58f394f81.zip
Per Adam Jackson, drop linux-2.6-intel-iommu-igfx.patch
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 66579de1..8fd9db7d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 2
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -690,8 +690,6 @@ Patch1800: drm-vgem.patch
Patch1824: drm-intel-next.patch
Patch1825: drm-i915-dp-stfu.patch
-Patch1900: linux-2.6-intel-iommu-igfx.patch
-
# Quiet boot fixes
# silence the ACPI blacklist code
Patch2802: linux-2.6-silence-acpi-blacklist.patch
@@ -1400,8 +1398,6 @@ ApplyPatch drm-vgem.patch
ApplyOptionalPatch drm-intel-next.patch
ApplyPatch drm-i915-dp-stfu.patch
-ApplyPatch linux-2.6-intel-iommu-igfx.patch
-
# silence the ACPI blacklist code
ApplyPatch linux-2.6-silence-acpi-blacklist.patch
ApplyPatch quite-apm.patch
@@ -2300,6 +2296,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu May 31 2012 Josh Boyer <jwboyer@redhat.com>
+- Per Adam Jackson, drop linux-2.6-intel-iommu-igfx.patch
+
* Thu May 31 2012 Josh Boyer <jwboyer@redhat.com> - 3.5.0-0.rc0.git10.2
- Fix crash in cirrus qemu driver from Dave Airlie (rhbz 826983)