diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-20 05:11:33 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-20 05:11:33 +0100 |
| commit | 7d8be17add28024f1bcfb6546f43749a95036db1 (patch) | |
| tree | 61de7885d54818c61f058806c10fe03a8a4c3d84 /kernel.spec | |
| parent | fb491457c805c77df6af076e62737f8bbca62447 (diff) | |
| parent | 2809b7faa6a8cb232cd825096c146b7bdc1e08ea (diff) | |
| download | kernel-7d8be17add28024f1bcfb6546f43749a95036db1.tar.gz kernel-7d8be17add28024f1bcfb6546f43749a95036db1.tar.xz kernel-7d8be17add28024f1bcfb6546f43749a95036db1.zip | |
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedorakernel-5.4.21-150.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 726296ddd..cafcd5d20 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,8 +1,6 @@ # We have to override the new %%install behavior because, well... the kernel is special. %global __spec_install_pre %{___build_pre} -%define pe_signing_token OpenSC Card (Fedora Signer) - Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide @@ -63,7 +61,7 @@ Summary: The Linux kernel %define stable_rc 0 # Do we have a -stable update to apply? -%define stable_update 20 +%define stable_update 21 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -579,6 +577,10 @@ Patch523: media-rc-prevent-memory-leak-in-cx23888_ir_probe.patch # CVE-2019-18808 rhbz 1777418 1777421 Patch527: 0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1797052 +# http://lists.infradead.org/pipermail/linux-arm-kernel/2020-February/712003.html +Patch528: 0001-mm-Avoid-creating-virtual-address-aliases-in-brk-mma.patch + # https://gitlab.freedesktop.org/drm/intel/issues/673 Patch612: drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch @@ -1827,6 +1829,9 @@ fi # # %changelog +* Wed Feb 19 2020 Jeremy Cline <jcline@redhat.com> - 5.4.21-100 +- Linux v5.4.21 + * Mon Feb 17 2020 Jeremy Cline <jcline@redhat.com> - 5.4.20-100 - Linux v5.4.20 |