summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-25 17:36:04 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-25 17:36:04 -0400
commitb6d84528bca03e062e1108865cc293026c5a3298 (patch)
treebe0b99438270f33ac90ef779b41963382448626e /kernel.spec
parent9d4f1f002935c24a9e8b5459726d01b702445285 (diff)
downloadkernel-b6d84528bca03e062e1108865cc293026c5a3298.tar.gz
kernel-b6d84528bca03e062e1108865cc293026c5a3298.tar.xz
kernel-b6d84528bca03e062e1108865cc293026c5a3298.zip
Add patches to fix a few more i915 hangs/oopses
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec13
1 files changed, 8 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 4e7a0200f..caa995802 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -40,7 +40,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 1
+%global baserelease 4
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -627,12 +627,12 @@ Patch26171: acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
Patch26172: drm-Fixup-racy-refcounting-in-plane_force_disable.patch
Patch26173: drm-i915-Don-t-try-to-reference-the-fb-in-get_initia.patch
+Patch26175: drm-i915-Fix-atomic-state-when-reusing-the-firmware-.patch
+Patch26176: drm-i915-Fixup-legacy-plane-crtc-link-for-initial-fb.patch
#rhbz 1203584
Patch26174: Input-ALPS-fix-max-coordinates-for-v5-and-v7-protoco.patch
-#atch26175: intel.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -1371,12 +1371,12 @@ ApplyPatch acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
ApplyPatch drm-Fixup-racy-refcounting-in-plane_force_disable.patch
ApplyPatch drm-i915-Don-t-try-to-reference-the-fb-in-get_initia.patch
+ApplyPatch drm-i915-Fix-atomic-state-when-reusing-the-firmware-.patch
+ApplyPatch drm-i915-Fixup-legacy-plane-crtc-link-for-initial-fb.patch
#rhbz 1203584
ApplyPatch Input-ALPS-fix-max-coordinates-for-v5-and-v7-protoco.patch
-#pplyPatch intel.patch
-
# END OF PATCH APPLICATIONS
%endif
@@ -2227,6 +2227,9 @@ fi
#
#
%changelog
+* Wed Mar 25 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git2.4
+- Add patches to fix a few more i915 hangs/oopses
+
* Wed Mar 25 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git2.1
- Linux v4.0-rc5-53-gc875f421097a