From 793ffbcc8d4506d49de234d2c03d46aa0718978f Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 9 Jan 2020 10:30:35 -0500 Subject: Revert "Enable ASoC SOF driver for Intel DSP" Back out the SOF driver support for now as it is causing a number of regressions. --- kernel.spec | 6 ------ 1 file changed, 6 deletions(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 439435bfe..f1610e1f6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -601,12 +601,6 @@ 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 -- cgit From a65efe852d35caeccb4c4bc6d2f69125bab945df Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 9 Jan 2020 10:46:47 -0500 Subject: Linux v5.4.10 --- kernel.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index f1610e1f6..52e54a0f1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 8 +%define stable_update 10 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -595,16 +595,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 - -# 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 @@ -1848,6 +1838,9 @@ fi # # %changelog +* Thu Jan 09 2020 Jeremy Cline - 5.4.10-100 +- Linux v5.4.10 + * Mon Jan 06 2020 Laura Abbott - Fix for tpm usercopy (rhbz 1788653) -- cgit From 3fee1b49307e6e9086b528bf086007d8b89c8fdf Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 25 Nov 2019 17:23:43 -0500 Subject: Clean up stray *.h.s files The various header testing options (e.g. CONFIG_KERNEL_HEADER_TEST) leave a lot of stray *.s files around. Make sure these get cleaned up so they don't end up packaged. --- kernel.spec | 3 +++ 1 file changed, 3 insertions(+) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 52e54a0f1..442a69dc2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1306,6 +1306,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 -- cgit