diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-22 10:33:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-22 10:33:57 +0200 |
| commit | 70a6b04a5b1d2e38c6b3aa0a46746d082b7830ea (patch) | |
| tree | c81e204e692bbc16c685ae00884db57991444188 /kernel.spec | |
| parent | 1e058a4487de61d8fc9a84c744b5b2ea891f1b8b (diff) | |
| parent | 02c2fcec703246b9ff92593b7c4d79a86ad4d278 (diff) | |
| download | kernel-70a6b04a5b1d2e38c6b3aa0a46746d082b7830ea.tar.gz kernel-70a6b04a5b1d2e38c6b3aa0a46746d082b7830ea.tar.xz kernel-70a6b04a5b1d2e38c6b3aa0a46746d082b7830ea.zip | |
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/kernel.spec b/kernel.spec index 86989125f..53096deea 100644 --- a/kernel.spec +++ b/kernel.spec @@ -659,13 +659,13 @@ Source15: redhatsecureboot301.cer Source16: secureboot_s390.cer Source17: secureboot_ppc.cer -%define secureboot_ca_0 %{SOURCE12} -%define secureboot_ca_1 %{SOURCE13} +%define secureboot_ca_1 %{SOURCE12} +%define secureboot_ca_0 %{SOURCE13} %ifarch x86_64 aarch64 -%define secureboot_key_0 %{SOURCE14} -%define pesign_name_0 redhatsecureboot501 -%define secureboot_key_1 %{SOURCE15} -%define pesign_name_1 redhatsecureboot301 +%define secureboot_key_1 %{SOURCE14} +%define pesign_name_1 redhatsecureboot501 +%define secureboot_key_0 %{SOURCE15} +%define pesign_name_0 redhatsecureboot301 %endif %ifarch s390x %define secureboot_key_0 %{SOURCE16} @@ -683,12 +683,12 @@ Source13: redhatsecurebootca2.cer Source14: redhatsecureboot401.cer Source15: redhatsecureboot003.cer -%define secureboot_ca_0 %{SOURCE12} -%define secureboot_ca_1 %{SOURCE13} -%define secureboot_key_0 %{SOURCE14} -%define pesign_name_0 redhatsecureboot401 -%define secureboot_key_1 %{SOURCE15} -%define pesign_name_1 redhatsecureboot003 +%define secureboot_ca_1 %{SOURCE12} +%define secureboot_ca_0 %{SOURCE13} +%define secureboot_key_1 %{SOURCE14} +%define pesign_name_1 redhatsecureboot401 +%define secureboot_key_0 %{SOURCE15} +%define pesign_name_0 redhatsecureboot003 %endif # released_kernel @@ -905,6 +905,9 @@ Patch124: 0001-PCI-Add-MCFG-quirks-for-Tegra194-host-controllers.patch # Killer wireless headed to stable Patch125: iwlwifi-make-some-killer-wireless-ac-1550-cards-work-again.patch +# rhbz 1858645 +Patch126: copy_xstate_to_kernel-fix-typo-which-caused-gdb-regression.patch + # END OF PATCH DEFINITIONS %endif @@ -2946,6 +2949,9 @@ fi # # %changelog +* Mon Jul 20 2020 Justin M. Forbes <jforbes@fedoraproject.org> +- Fix GDB regression (rhbz 1858645) + * Fri Jul 17 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.9-100 - Linux v5.7.9 |