summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2016-10-29 09:57:13 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2016-10-29 09:57:13 +0200
commite5ac5bd56811123291d2370cfabd0b2fa2a9f883 (patch)
treeb9dc350ed9077f78e0eecf39331bca05e7a6224c /kernel.spec
parentc38fa623e21e4f00daebb26091a5ddf375e954cb (diff)
parent45e0139f36e81c51ba46675acbba47c962a5571f (diff)
downloadkernel-4.8.5-200.vanilla.knurd.1.fc24.tar.gz
kernel-4.8.5-200.vanilla.knurd.1.fc24.tar.xz
kernel-4.8.5-200.vanilla.knurd.1.fc24.zip
Merge remote-tracking branch 'origin/f24' into f24-user-thl-vanilla-fedorakernel-4.8.5-200.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec21
1 files changed, 18 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index 065be5453..bfcfd8ec8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -59,7 +59,7 @@ Summary: The Linux kernel
# Do we have a -stable update to apply?
-%define stable_update 4
+%define stable_update 5
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -618,8 +618,6 @@ Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
# Patch503: drm-i915-turn-off-wc-mmaps.patch
-Patch504: i8042-skip-selftest-asus-laptops.patch
-
Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch
#CVE-2016-3134 rhbz 1317383 1317384
@@ -643,6 +641,15 @@ Patch848: 0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch
#ongoing complaint, full discussion delayed until ksummit/plumbers
Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch
+# CVE-2016-9083 CVE-2016-9084 rhbz 1389258 1389259 1389285
+Patch850: v3-vfio-pci-Fix-integer-overflows-bitmask-check.patch
+
+# Skylake i915 fixes from 4.9
+Patch851: drm_i915_skl_Backport_watermark_fixes_for_4.8.y.patch
+
+#rhbz 1325354
+Patch852: 0001-HID-input-ignore-System-Control-application-usages-i.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2173,6 +2180,14 @@ fi
#
#
%changelog
+* Fri Oct 28 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.5-200
+- Linux v4.8.5
+
+* Thu Oct 27 2016 Justin M. Forbes <jforbes@fedoraproject.org>
+- CVE-2016-9083 CVE-2016-9084 vfio multiple flaws (rhbz 1389258 1389259 1389285)
+- Skylake i915 fixes from 4.9
+- Fix MS input devices identified as joysticks (rhbz 1325354)
+
* Mon Oct 24 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.4-200
- Linux v4.8.4 rebase