diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-14 19:15:00 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-14 19:15:00 +0200 |
| commit | fbc6668cf1ea5c69b5b59e47003abb422ec89ec3 (patch) | |
| tree | 7fd667469312c9d3fea7d2cf0c953770dd264802 /kernel.spec | |
| parent | 355029376080a4e2a4b738495d7acd585cdc3d22 (diff) | |
| parent | 32ae435a9cb269bc9de499608b9928d635be21fa (diff) | |
| download | kernel-fbc6668cf1ea5c69b5b59e47003abb422ec89ec3.tar.gz kernel-fbc6668cf1ea5c69b5b59e47003abb422ec89ec3.tar.xz kernel-fbc6668cf1ea5c69b5b59e47003abb422ec89ec3.zip | |
Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedorakernel-4.11.5-200.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index fd9c4f5cf..71a8a5ee3 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 4 +%define stable_update 5 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -652,6 +652,9 @@ Patch679: actual_udpencap_fix.patch Patch680: 0001-platform-x86-thinkpad_acpi-guard-generic-hotkey-case.patch Patch681: 0002-platform-x86-thinkpad_acpi-add-mapping-for-new-hotke.patch +# rhbz 1461337 +Patch682: 0001-efi-Fix-boot-panic-because-of-invalid-BGRT-image-add.patch + # END OF PATCH DEFINITIONS %endif @@ -2219,6 +2222,12 @@ fi # # %changelog +* Wed Jun 14 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.5-200 +- Linux v4.11.5 + +* Wed Jun 14 2017 Laura Abbott <labbott@fedoraproject.org> +- Add fix for EFI BGRT crash (rhbz 1461337) + * Wed Jun 07 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.4-200 - Linux v4.11.4 |