diff --git a/Makefile.rhelver b/Makefile.rhelver index 6a1f6507f..71abf2b04 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 = 125 +RHEL_RELEASE = 126 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 08e708fb4..81d4c87ef 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/ac66897491812e72306020ec0bbf718f5d0b56f7 - ac66897491812e72306020ec0bbf718f5d0b56f7 irq: export irq_check_status_bit +https://gitlab.com/cki-project/kernel-ark/-/commit/36f1e34897c71ca70e4f3489e9a767a7564a580a + 36f1e34897c71ca70e4f3489e9a767a7564a580a irq: export irq_check_status_bit https://gitlab.com/cki-project/kernel-ark/-/commit/e187313e5f0086538fefe0925ef84480f99616d8 e187313e5f0086538fefe0925ef84480f99616d8 gcc-plugins: fix gcc 11 indigestion with plugins... diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 4a70df11e..244c6a211 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6509,8 +6509,6 @@ CONFIG_SND_SOC_AK5558=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_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_APQ8016_SBC=m CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 42df73ce4..6a9785986 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -167,7 +167,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -1151,7 +1151,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5191,8 +5191,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d759ac7e8..1ec5984d9 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6485,8 +6485,6 @@ CONFIG_SND_SOC_AK5558=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_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_APQ8016_SBC=m CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 08e573649..8f95812ba 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -167,7 +167,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -1143,7 +1143,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5169,8 +5169,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 8893a83b9..69b632a0f 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6680,8 +6680,6 @@ CONFIG_SND_SOC_AK5558=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_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_APQ8016_SBC is not set CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 8ee6ceb14..2ac9b2428 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6659,8 +6659,6 @@ CONFIG_SND_SOC_AK5558=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_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_APQ8016_SBC is not set CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index a982c8263..8b236b4af 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6480,8 +6480,6 @@ CONFIG_SND_SOC_AK5558=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_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_APQ8016_SBC is not set CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 10ea20e6e..79d1ff178 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6459,8 +6459,6 @@ CONFIG_SND_SOC_AK5558=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_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_APQ8016_SBC is not set CONFIG_SND_SOC_ARNDALE=m CONFIG_SND_SOC_BD28623=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index f1e61ab27..66e731209 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5535,8 +5535,6 @@ CONFIG_SND_SOC_AK5558=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_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index bdb259d17..0ccc6f608 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -162,7 +162,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set @@ -1033,7 +1033,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5036,8 +5036,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f037f05a0..50db6c4f4 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5513,8 +5513,6 @@ CONFIG_SND_SOC_AK5558=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_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 6e66af0ec..85bfe56ba 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -162,7 +162,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set @@ -1025,7 +1025,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5018,8 +5018,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index f70ea25df..edd1708be 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5477,8 +5477,6 @@ CONFIG_SND_SOC_AK5558=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_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 8feb1e7e0..f60ae530e 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -159,7 +159,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set CONFIG_AMIGA_PARTITION=y @@ -1039,7 +1039,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -4979,8 +4979,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 8a3e04aeb..668a4db32 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5455,8 +5455,6 @@ CONFIG_SND_SOC_AK5558=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_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 660fa68c6..393dc3e1f 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -159,7 +159,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set CONFIG_AMIGA_PARTITION=y @@ -1031,7 +1031,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -4961,8 +4961,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index dc58b0c5e..1dd18fd38 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -159,7 +159,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set @@ -1041,7 +1041,7 @@ CONFIG_DEFAULT_SECURITY_DAC=y # CONFIG_DEFAULT_SECURITY_SELINUX is not set # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -4990,8 +4990,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index c28290d3c..1bb1ad85c 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -181,7 +181,7 @@ CONFIG_AMD_IOMMU=y CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -1096,7 +1096,7 @@ CONFIG_DELL_SMO8800=m CONFIG_DELL_WMI_AIO=m CONFIG_DELL_WMI_LED=m CONFIG_DELL_WMI=m -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5187,7 +5187,7 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set +CONFIG_SND_SOC_AMD_RENOIR_MACH=m # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 164b5f720..c2681d4cf 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -181,7 +181,7 @@ CONFIG_AMD_IOMMU=y CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -1088,7 +1088,7 @@ CONFIG_DELL_SMO8800=m CONFIG_DELL_WMI_AIO=m CONFIG_DELL_WMI_LED=m CONFIG_DELL_WMI=m -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5166,7 +5166,7 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set +CONFIG_SND_SOC_AMD_RENOIR_MACH=m # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set diff --git a/kernel.spec b/kernel.spec index 53c962ead..d422acb44 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc3.125 +%global distro_build 0.rc3.126 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc3.125 +%define pkgrelease 0.rc3.126 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.125%{?buildid}%{?dist} +%define specrelease 0.rc3.126%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -601,7 +601,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.11.0-0.rc3.125.tar.xz +Source0: linux-5.11.0-0.rc3.126.tar.xz Source1: Makefile.rhelver @@ -614,47 +614,48 @@ Source1: Makefile.rhelver %define signing_key_filename kernel-signing-s390.cer %endif -Source10: x509.genkey.rhel -Source11: x509.genkey.fedora +Source8: x509.genkey.rhel +Source9: x509.genkey.fedora + %if %{?released_kernel} -Source12: redhatsecurebootca5.cer -Source13: redhatsecurebootca1.cer -Source14: redhatsecureboot501.cer -Source15: redhatsecureboot301.cer -Source16: secureboot_s390.cer -Source17: secureboot_ppc.cer +Source10: redhatsecurebootca5.cer +Source11: redhatsecurebootca1.cer +Source12: redhatsecureboot501.cer +Source13: redhatsecureboot301.cer +Source14: secureboot_s390.cer +Source15: secureboot_ppc.cer -%define secureboot_ca_1 %{SOURCE12} -%define secureboot_ca_0 %{SOURCE13} +%define secureboot_ca_1 %{SOURCE10} +%define secureboot_ca_0 %{SOURCE11} %ifarch x86_64 aarch64 -%define secureboot_key_1 %{SOURCE14} +%define secureboot_key_1 %{SOURCE12} %define pesign_name_1 redhatsecureboot501 -%define secureboot_key_0 %{SOURCE15} +%define secureboot_key_0 %{SOURCE13} %define pesign_name_0 redhatsecureboot301 %endif %ifarch s390x -%define secureboot_key_0 %{SOURCE16} +%define secureboot_key_0 %{SOURCE14} %define pesign_name_0 redhatsecureboot302 %endif %ifarch ppc64le -%define secureboot_key_0 %{SOURCE17} +%define secureboot_key_0 %{SOURCE15} %define pesign_name_0 redhatsecureboot303 %endif # released_kernel %else -Source12: redhatsecurebootca4.cer -Source13: redhatsecurebootca2.cer -Source14: redhatsecureboot401.cer -Source15: redhatsecureboot003.cer +Source10: redhatsecurebootca4.cer +Source11: redhatsecurebootca2.cer +Source12: redhatsecureboot401.cer +Source13: redhatsecureboot003.cer -%define secureboot_ca_1 %{SOURCE12} -%define secureboot_ca_0 %{SOURCE13} -%define secureboot_key_1 %{SOURCE14} +%define secureboot_ca_1 %{SOURCE10} +%define secureboot_ca_0 %{SOURCE11} +%define secureboot_key_1 %{SOURCE12} %define pesign_name_1 redhatsecureboot401 -%define secureboot_key_0 %{SOURCE15} +%define secureboot_key_0 %{SOURCE13} %define pesign_name_0 redhatsecureboot003 # released_kernel @@ -1245,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.0-0.rc3.125 -c -mv linux-5.11.0-0.rc3.125 linux-%{KVERREL} +%setup -q -n kernel-5.11.0-0.rc3.126 -c +mv linux-5.11.0-0.rc3.126 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2065,11 +2066,11 @@ popd %endif %if %{with_selftests} -%{make} -s ARCH=$Arch V=1 samples/bpf/ +%{make} -s %{?_smp_mflags} ARCH=$Arch V=1 samples/bpf/ pushd tools/testing/selftests # We need to install here because we need to call make with ARCH set which # doesn't seem possible to do in the install section. -%{make} -s ARCH=$Arch V=1 TARGETS="bpf livepatch net" INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests install +%{make} -s %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net" INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests install popd %endif @@ -2734,15 +2735,20 @@ fi # # %changelog -* Thu Jan 14 2021 Herton R. Krzesinski [5.11.0-0.rc3.125] -- v5.11-rc3-68-g65f0d2414b70 rebase -- build system: run parallel make for bpf and kselftests install (Denys Vlasenko) -- Use cross_arm to compile kernel-ark on copr for armhfp (Nicolas Chauvet) +* Fri Jan 15 2021 Herton R. Krzesinski [5.11.0-0.rc3.126] +- v5.11-rc3-193-g5ee88057889b rebase -* Thu Jan 14 2021 Fedora Kernel Team [5.11.0-0.rc3.20210114git65f0d2414b70.125] +* Fri Jan 15 2021 Fedora Kernel Team [5.11.0-0.rc3.20210115git5ee88057889b.126] - irq: export irq_check_status_bit (Levi Yun) - Turn off vdso_install for ppc ("Justin M. Forbes") +* Fri Jan 15 2021 Fedora Kernel Team [5.11.0-0.rc3.20210115git5ee88057889b.125] +- redhat: avoid conflict with mod-blacklist.sh and released_kernel defined ("Herton R. Krzesinski") +- redhat: handle certificate files conditionally as done for src.rpm ("Herton R. Krzesinski") +- Run MR testing in CKI pipeline (Veronika Kabatova) +- specfile: add {?_smp_mflags} to "make headers_install" in tools/testing/selftests (Denys Vlasenko) +- specfile: add {?_smp_mflags} to "make samples/bpf/" (Denys Vlasenko) + * Thu Jan 14 2021 Fedora Kernel Team [5.11.0-0.rc3.20210114git65f0d2414b70.124] - Reword comment (Nicolas Chauvet) - Add with_cross_arm conditional (Nicolas Chauvet) diff --git a/redhatsecureboot301.cer b/redhatsecureboot301.cer deleted file mode 100644 index 20e660479..000000000 Binary files a/redhatsecureboot301.cer and /dev/null differ diff --git a/redhatsecureboot501.cer b/redhatsecureboot501.cer deleted file mode 100644 index dfa7afb46..000000000 Binary files a/redhatsecureboot501.cer and /dev/null differ diff --git a/redhatsecurebootca1.cer b/redhatsecurebootca1.cer deleted file mode 100644 index b2354007b..000000000 Binary files a/redhatsecurebootca1.cer and /dev/null differ diff --git a/redhatsecurebootca5.cer b/redhatsecurebootca5.cer deleted file mode 100644 index dfb028495..000000000 Binary files a/redhatsecurebootca5.cer and /dev/null differ diff --git a/secureboot_ppc.cer b/secureboot_ppc.cer deleted file mode 100644 index 2c0087dbc..000000000 Binary files a/secureboot_ppc.cer and /dev/null differ diff --git a/secureboot_s390.cer b/secureboot_s390.cer deleted file mode 100644 index 137d3858f..000000000 Binary files a/secureboot_s390.cer and /dev/null differ diff --git a/sources b/sources index 978b8f167..d8e03c253 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.0-0.rc3.125.tar.xz) = 1447eb81af40e09b3fb434a54cbe5f2bfd47fe0059b8d3629d909e39b8c7f4a69f8cf4726fe1953a444f6927318b9a9a0466f19800b88ef14aad4fb9982b9b75 -SHA512 (kernel-abi-whitelists-5.11.0-0.rc3.125.tar.bz2) = 99f3edfbe86632a19cd8ae1bcf085734158e71133324e14be2bbab5acd00b1d6292eeb1c7ae9388a5e5f1fb7ec84058aceb74c58e24a1bab76840f7b6738b791 -SHA512 (kernel-kabi-dw-5.11.0-0.rc3.125.tar.bz2) = ce0ff40db514aee886a7d11158f444ab410d7c486ca88a0ba979b85a14604efc3ab418364bc07a080a420369c85e7fa9128c6c0fd78c3ce27f11e9a3dfef9d2f +SHA512 (linux-5.11.0-0.rc3.126.tar.xz) = d6b5ec78460ee4a743d85373f9289b21eb35fd7b3a0dc60df5344223323fe0b0ca1d8752b7ec32b6108f6e28d830e441a5ff911f29792886952f07e8af704d20 +SHA512 (kernel-abi-whitelists-5.11.0-0.rc3.126.tar.bz2) = 250e20f36ea014d699c6d03a7b7c6a400b00b47c1640a5ac7239371ea833d6e6494a684ea92dc6d1cb58b43f1962f8b6b57ae409c947c83daeb083d5fcd3d14b +SHA512 (kernel-kabi-dw-5.11.0-0.rc3.126.tar.bz2) = 1936f466816877e49b606e1822495e6f7232da37baa110e54d295143525aafcb13c4b6b56e7315c16e31476e9c42b7c235bcdad238a0452b189a99cc94187846