summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-01-22 12:56:07 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2016-01-22 13:05:39 -0500
commit8a0bfe0000e40d4f0bf15daa0aa1f81bd93fc901 (patch)
tree77bc81f7e5e708255a9b168e51be3a939b754be5 /kernel.spec
parent54d98c1fb3db3e092913cfb7f376a7b083f07c7f (diff)
downloadkernel-8a0bfe0000e40d4f0bf15daa0aa1f81bd93fc901.tar.gz
kernel-8a0bfe0000e40d4f0bf15daa0aa1f81bd93fc901.tar.xz
kernel-8a0bfe0000e40d4f0bf15daa0aa1f81bd93fc901.zip
Fix backtrace from PNP conflict on Haswell-ULT (rhbz 1300955)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 90ac28b95..7cf8f9f5d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -602,6 +602,9 @@ Patch637: tty-Fix-unsafe-ldisc-reference-via-ioctl-TIOCGETD.patch
#rhbz 1279653
Patch638: rtlwifi-rtl8821ae-Fix-5G-failure-when-EEPROM-is-inco.patch
+#rhbz 1300955
+Patch640: PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2047,6 +2050,9 @@ fi
#
#
%changelog
+* Fri Jan 22 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix backtrace from PNP conflict on Haswell-ULT (rhbz 1300955)
+
* Thu Jan 21 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc0.git8.1
- Linux v4.4-10062-g30f0530