diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-24 06:39:38 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-24 06:40:08 +0100 |
commit | 2d2378469c95288a1c825b4b05afa4280f0803ec (patch) | |
tree | 77d843b408adacc7b9c17066537b34247d87a67f /kernel.spec | |
parent | e8b8371d820a43d6b71b2bc7a89c573f41a883dc (diff) | |
parent | 6ed7c3491e269e491e3d21f682bf7012750cd32e (diff) | |
download | kernel-2d2378469c95288a1c825b4b05afa4280f0803ec.tar.gz kernel-2d2378469c95288a1c825b4b05afa4280f0803ec.tar.xz kernel-2d2378469c95288a1c825b4b05afa4280f0803ec.zip |
merge origin
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 8918fe7ff..70e9ba3aa 100644 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 250 +%global baserelease 200 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -822,9 +822,6 @@ Patch503: KEYS-Make-use-of-platform-keyring-for-module-signature.patch # https://lkml.org/lkml/2019/8/29/1772 Patch504: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch -# CVE-2019-19043 rhbz 1774972 1774973 -Patch512: net-next-v2-9-9-i40e-prevent-memory-leak-in-i40e_setup_macvlans.patch - # CVE-2019-19046 rhbz 1774988 1774989 Patch514: ipmi-Fix-memory-leak-in-__ipmi_bmc_register.patch @@ -847,6 +844,9 @@ Patch600: alsa-5.5.patch # ALSA code from v5.6 (Intel ASoC Sound Open Firmware driver support) Patch601: alsa-5.6.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1772498#c101 +Patch602: ASoC-topology-fix-soc_tplg_fe_link_create-link-dobj-.patch + # END OF PATCH DEFINITIONS %endif @@ -2547,6 +2547,9 @@ fi # # %changelog +* Thu Jan 23 2020 Jeremy Cline <jcline@redhat.com> - 5.4.14-200 +- Linux v5.4.14 + * Tue Jan 21 2020 Jeremy Cline <jcline@redhat.com> - 5.4.13-201 - Re-add the Intel ASoC Sound Open Firmware driver support |