From 3e068b5c506ac31b91394315fb8ecc7a45437571 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 15 Nov 2022 11:15:51 -0600 Subject: [PATCH] kernel-6.1.0-0.rc5.20221115gite01d50cbd6ee.40 * Tue Nov 15 2022 Fedora Kernel Team [6.1.0-0.rc5.e01d50cbd6ee.40] - redhat: avoid picking up stray editor backups when processing configs (Clark Williams) - CI: Remove old configs (Veronika Kabatova) - redhat: override `make help` to include dist-help (Jonathan Toppins) - redhat: make RHTEST stricter (Jonathan Toppins) - redhat: Enable support for SN2201 system (Ivan Vecera) - redhat/docs/index.rst: Add FLAVOR information to generate configs for local builds (Enric Balletbo i Serra) - Linux v6.1.0-0.rc5.e01d50cbd6ee Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-x86_64-debug-fedora.config | 5 +++-- kernel-x86_64-debug-rhel.config | 5 +++-- kernel-x86_64-fedora.config | 5 +++-- kernel-x86_64-rhel.config | 5 +++-- kernel.spec | 17 +++++++++++++---- sources | 6 +++--- 7 files changed, 29 insertions(+), 16 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 8f0230ed4..679b748aa 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 39 +RHEL_RELEASE = 40 # # ZSTREAM diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 6925ed0a1..6aa0e3461 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4709,7 +4709,7 @@ CONFIG_NVME_TARGET_TCP=m CONFIG_NVME_TCP=m # CONFIG_NVME_VERBOSE_ERRORS is not set CONFIG_NVRAM=y -# CONFIG_NVSW_SN2201 is not set +CONFIG_NVSW_SN2201=m CONFIG_NV_TCO=m CONFIG_NXP_C45_TJA11XX_PHY=m # CONFIG_NXP_TJA11XX_PHY is not set @@ -6377,7 +6377,8 @@ CONFIG_SND_SOC_AMD_ACP6x=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -# CONFIG_SND_SOC_AMD_PS is not set +CONFIG_SND_SOC_AMD_PS=m +CONFIG_SND_SOC_AMD_PS_MACH=m CONFIG_SND_SOC_AMD_RENOIR=m CONFIG_SND_SOC_AMD_RENOIR_MACH=m CONFIG_SND_SOC_AMD_RPL_ACP6x=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 566473fe0..c4d265b0d 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4091,7 +4091,7 @@ CONFIG_NVME_TARGET_TCP=m CONFIG_NVME_TCP=m # CONFIG_NVME_VERBOSE_ERRORS is not set CONFIG_NVRAM=y -# CONFIG_NVSW_SN2201 is not set +CONFIG_NVSW_SN2201=m # CONFIG_NV_TCO is not set # CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set @@ -5603,7 +5603,8 @@ CONFIG_SND_SOC_AMD_ACP6x=m # CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set -# CONFIG_SND_SOC_AMD_PS is not set +CONFIG_SND_SOC_AMD_PS=m +CONFIG_SND_SOC_AMD_PS_MACH=m CONFIG_SND_SOC_AMD_RENOIR=m CONFIG_SND_SOC_AMD_RENOIR_MACH=m # CONFIG_SND_SOC_AMD_RPL_ACP6x is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index fb0ecfcf0..d4daf8261 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4690,7 +4690,7 @@ CONFIG_NVME_TARGET_TCP=m CONFIG_NVME_TCP=m # CONFIG_NVME_VERBOSE_ERRORS is not set CONFIG_NVRAM=y -# CONFIG_NVSW_SN2201 is not set +CONFIG_NVSW_SN2201=m CONFIG_NV_TCO=m CONFIG_NXP_C45_TJA11XX_PHY=m # CONFIG_NXP_TJA11XX_PHY is not set @@ -6356,7 +6356,8 @@ CONFIG_SND_SOC_AMD_ACP6x=m CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m -# CONFIG_SND_SOC_AMD_PS is not set +CONFIG_SND_SOC_AMD_PS=m +CONFIG_SND_SOC_AMD_PS_MACH=m CONFIG_SND_SOC_AMD_RENOIR=m CONFIG_SND_SOC_AMD_RENOIR_MACH=m CONFIG_SND_SOC_AMD_RPL_ACP6x=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index c97d875fd..bcda2a3df 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4071,7 +4071,7 @@ CONFIG_NVME_TARGET_TCP=m CONFIG_NVME_TCP=m # CONFIG_NVME_VERBOSE_ERRORS is not set CONFIG_NVRAM=y -# CONFIG_NVSW_SN2201 is not set +CONFIG_NVSW_SN2201=m # CONFIG_NV_TCO is not set # CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set @@ -5580,7 +5580,8 @@ CONFIG_SND_SOC_AMD_ACP6x=m # CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set -# CONFIG_SND_SOC_AMD_PS is not set +CONFIG_SND_SOC_AMD_PS=m +CONFIG_SND_SOC_AMD_PS_MACH=m CONFIG_SND_SOC_AMD_RENOIR=m CONFIG_SND_SOC_AMD_RENOIR_MACH=m # CONFIG_SND_SOC_AMD_RPL_ACP6x is not set diff --git a/kernel.spec b/kernel.spec index c3a31a83e..c6fb0f4f2 100755 --- a/kernel.spec +++ b/kernel.spec @@ -119,17 +119,17 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # define buildid .local %define specversion 6.1.0 %define patchversion 6.1 -%define pkgrelease 0.rc5.39 +%define pkgrelease 0.rc5.20221115gite01d50cbd6ee.40 %define kversion 6 -%define tarfile_release 6.1-rc5 +%define tarfile_release 6.1-rc5-8-ge01d50cbd6ee # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.39%{?buildid}%{?dist} +%define specrelease 0.rc5.20221115gite01d50cbd6ee.40%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.1.0 @@ -3190,6 +3190,15 @@ fi # # %changelog +* Tue Nov 15 2022 Fedora Kernel Team [6.1.0-0.rc5.e01d50cbd6ee.40] +- redhat: avoid picking up stray editor backups when processing configs (Clark Williams) +- CI: Remove old configs (Veronika Kabatova) +- redhat: override `make help` to include dist-help (Jonathan Toppins) +- redhat: make RHTEST stricter (Jonathan Toppins) +- redhat: Enable support for SN2201 system (Ivan Vecera) +- redhat/docs/index.rst: Add FLAVOR information to generate configs for local builds (Enric Balletbo i Serra) +- Linux v6.1.0-0.rc5.e01d50cbd6ee + * Mon Nov 14 2022 Fedora Kernel Team [6.1.0-0.rc5.39] - Linux v6.1.0-0.rc5 diff --git a/sources b/sources index 6a88c4a1f..cd69c1910 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.1-rc5.tar.xz) = 849a180ba2caeda19d3d593372b23a942f8e5927a37b04921d182310303a8b7a94dacc825832eca06da6c5dfe4373df694969656ec62c53277b00f86a8535b2e -SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = e47ce527ed5056f684ec1c4daac721a0c1faff455e84a0e7d2302e3063595a2974036bff3ed9abf1e928225a773f409fdcd9bfac5115870b077a47e27ba3d68d -SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 0c8a3b00c08d1d9324f382cb07c2dc93a25749c7418734c425cf11aec328008a3c513681c661d372d7827106d3cc9b45dfb6235a387423344ee4eed2261fb1c6 +SHA512 (linux-6.1-rc5-8-ge01d50cbd6ee.tar.xz) = 5c75b4fe45104fede5bb3208acf9a60e975ddef8db0915f790f38194f89f0e63211ea75bab103114333c5a19758b703041336bec5ac35fc35005626f8fdd4576 +SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = e06d88ca03ac02d3a2f58b9f1227e7ca8c456c39e752f40a663abb3af3cfbc8ff64edfbbfcba343f56bcfecfddef53745deea0f58e370ce376f70a154388876d +SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 1c7d080ca3781323338823f3ddb49087e8e9e71d60a5efe86d2870980580fe834f5ab006541efa006e8e43e388958b329a70951b8704c0a78ebdd069b8fd934a