diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-12 20:50:06 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-12 20:50:06 +0200 |
| commit | 38f982386de726f2e7f03a0f50be3c17f1129fb4 (patch) | |
| tree | 50093f4e525bc7ed3c2e6cf2e60f51ea081e0f9e /kernel.spec | |
| parent | 47717dc901c378af37172e9e75e97f9b28d7999b (diff) | |
| parent | 93455b620e55f3f85727bd8823d42961dcdc538d (diff) | |
| download | kernel-38f982386de726f2e7f03a0f50be3c17f1129fb4.tar.gz kernel-38f982386de726f2e7f03a0f50be3c17f1129fb4.tar.xz kernel-38f982386de726f2e7f03a0f50be3c17f1129fb4.zip | |
Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedorakernel-4.11.10-200.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 37cc0ade2..a27e4197e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -58,7 +58,7 @@ Summary: The Linux kernel %define stable_rc 0 # Do we have a -stable update to apply? -%define stable_update 9 +%define stable_update 10 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -648,6 +648,9 @@ Patch681: 0002-platform-x86-thinkpad_acpi-add-mapping-for-new-hotke.patch # rhbz 1459326 Patch683: RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch +# rhbz 1458599 +Patch685: 0001-ACPI-LPSS-Only-call-pwm_add_table-for-the-first-PWM-.patch + # END OF PATCH DEFINITIONS %endif @@ -2215,6 +2218,15 @@ fi # # %changelog +* Wed Jul 12 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.10-200 +- Linux v4.11.10 + +* Mon Jul 10 2017 Laura Abbott <labbott@fedoraproject.org> +- Only call pwm_add_table for the first PWM controller (rhbz 1458599) + +* Thu Jul 06 2017 Justin M. Forbes <jforbes@fedoraproject.org> +- CVE-2017-10810 fix virtio-gpu mem leak (rhbz 1468023 1468024) + * Wed Jul 05 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.9-200 - Linux v4.11.9 |