diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-23 07:25:45 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-23 07:25:45 +0100 |
commit | 034efe4ca5c73038d2a20fce00f92fcc6492334d (patch) | |
tree | 06b2ddad10b18293f258f05a8d10996afc37c101 /kernel.spec | |
parent | aa1e68ba1235221163cce9290459d6fb24b3d9cb (diff) | |
parent | 5166b3b763c8a0f1557054e5f178bc9d9d5c3148 (diff) | |
download | kernel-034efe4ca5c73038d2a20fce00f92fcc6492334d.tar.gz kernel-034efe4ca5c73038d2a20fce00f92fcc6492334d.tar.xz kernel-034efe4ca5c73038d2a20fce00f92fcc6492334d.zip |
merge origin
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 336451e3d..ee4ea603b 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 201 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -828,9 +828,6 @@ 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 -# CVE-2019-19064 rhbz 1775010 1775011 -Patch515: spi-lpspi-fix-memory-leak-in-fsl_lpspi_probe.patch - # CVE-2019-19054 rhbz 1775063 1775117 Patch523: media-rc-prevent-memory-leak-in-cx23888_ir_probe.patch @@ -844,6 +841,12 @@ Patch527: 0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch # https://gitlab.freedesktop.org/drm/intel/issues/673 Patch531: drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch +# ALSA code from v5.5 (Intel ASoC Sound Open Firmware driver support) +Patch600: alsa-5.5.patch + +# ALSA code from v5.6 (Intel ASoC Sound Open Firmware driver support) +Patch601: alsa-5.6.patch + # END OF PATCH DEFINITIONS %endif @@ -2544,6 +2547,12 @@ fi # # %changelog +* Tue Jan 21 2020 Jeremy Cline <jcline@redhat.com> - 5.4.13-201 +- Re-add the Intel ASoC Sound Open Firmware driver support + +* Mon Jan 20 2020 Jeremy Cline <jcline@redhat.com> - 5.4.13-200 +- Linux v5.4.13 + * Tue Jan 14 2020 Jeremy Cline <jcline@redhat.com> - 5.4.12-200 - Linux v5.4.12 |