diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-10 14:29:36 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-10 14:29:36 +0100 |
| commit | e8d1386306174cf72ea5ec5139d13da8a5dff91e (patch) | |
| tree | 641ceff8e69acc6d8737a9571a228e7ff7cc1fc9 /kernel.spec | |
| parent | de32fab008ee9ec400946620bc5d30bf1fff6063 (diff) | |
| parent | 3fee1b49307e6e9086b528bf086007d8b89c8fdf (diff) | |
| download | kernel-e8d1386306174cf72ea5ec5139d13da8a5dff91e.tar.gz kernel-e8d1386306174cf72ea5ec5139d13da8a5dff91e.tar.xz kernel-e8d1386306174cf72ea5ec5139d13da8a5dff91e.zip | |
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/kernel.spec b/kernel.spec index 4ac783323..02bdad050 100644 --- a/kernel.spec +++ b/kernel.spec @@ -613,22 +613,6 @@ Patch529: ath10k-fix-memory-leak.patch # CVE-2019-18808 rhbz 1777418 1777421 Patch531: 0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch -# CVE-2019-18809 rhbz 1777449 1777451 -Patch532: 0001-media-usb-fix-memory-leak-in-af9005_identify_state.patch - -# Arm64 regression fix - rhbz 1788624 -Patch533: arm64-revert-support-for-execute-only-user-mappings.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) -Patch607: alsa-5.6.patch - -# rhbz 1706557, both patches are upstream in v5.5-rc2 -Patch608: 0001-drm-nouveau-Move-the-declaration-of-struct-nouveau_c.patch -Patch609: 0002-drm-nouveau-Fix-drm-core-using-atomic-code-paths-on-.patch - # rhbz 1781288 Patch610: 0001-tracing-Do-not-create-directories-if-lockdown-is-in-.patch @@ -1343,6 +1327,9 @@ BuildKernel() { # dirs for additional modules per module-init-tools, kbuild/modules.txt mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates + # CONFIG_KERNEL_HEADER_TEST generates some extra files in the process of + # testing so just delete + find . -name *.h.s -delete # first copy everything cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build @@ -1875,6 +1862,9 @@ fi # # %changelog +* Thu Jan 09 2020 Jeremy Cline <jcline@redhat.com> - 5.4.10-100 +- Linux v5.4.10 + * Mon Jan 06 2020 Laura Abbott <labbott@redhat.com> - Fix for tpm usercopy (rhbz 1788653) |