From 8eb3c15cf5ae5708d57661531f730306515e6087 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Thu, 1 Dec 2022 09:53:13 -0600
Subject: [PATCH] kernel-6.1.0-0.rc7.20221201gitef4d3ea40565.54

* Thu Dec 01 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc7.ef4d3ea40565.54]
- Adjust path to compressed vmlinux kernel image for s390x (Justin M. Forbes) [2149273]
- Fedora config updates for 6.1 (Justin M. Forbes)
- redhat: genlog.sh should expect genlog.py in the current directory (Patrick Talbert)
- Linux v6.1.0-0.rc7.ef4d3ea40565
Resolves: rhbz#2149273

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 Makefile.rhelver                        |  2 +-
 kernel-aarch64-debug-fedora.config      | 27 +++++++++---------------
 kernel-aarch64-fedora.config            | 27 +++++++++---------------
 kernel-armv7hl-debug-fedora.config      | 28 ++++++++-----------------
 kernel-armv7hl-fedora.config            | 28 ++++++++-----------------
 kernel-armv7hl-lpae-debug-fedora.config | 28 ++++++++-----------------
 kernel-armv7hl-lpae-fedora.config       | 28 ++++++++-----------------
 kernel-ppc64le-debug-fedora.config      | 19 +++--------------
 kernel-ppc64le-fedora.config            | 19 +++--------------
 kernel-s390x-debug-fedora.config        | 23 +++-----------------
 kernel-s390x-fedora.config              | 23 +++-----------------
 kernel-x86_64-debug-fedora.config       | 24 +++++----------------
 kernel-x86_64-fedora.config             | 24 +++++----------------
 kernel.spec                             | 12 ++++++++---
 sources                                 |  6 +++---
 15 files changed, 91 insertions(+), 227 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 1a9805313..16c18b9f9 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 = 53
+RHEL_RELEASE = 54
 
 #
 # ZSTREAM
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 52c12f35d..0c84a107a 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2164,7 +2164,7 @@ CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI=y
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 CONFIG_EMAC_ROCKCHIP=m
 # CONFIG_EMBEDDED is not set
@@ -3609,7 +3609,7 @@ CONFIG_KEYBOARD_IMX_SC_KEY=m
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_PINEPHONE is not set
+CONFIG_KEYBOARD_PINEPHONE=m
 CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
@@ -5029,7 +5029,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -5134,19 +5134,19 @@ CONFIG_NVMEM_APPLE_EFUSES=m
 CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_NVMEM_IMX_OCOTP_SCU=m
 CONFIG_NVMEM_LAYERSCAPE_SFP=m
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
+CONFIG_NVMEM_MESON_EFUSE=m
+CONFIG_NVMEM_MESON_MX_EFUSE=m
 CONFIG_NVMEM_QCOM_QFPROM=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
+CONFIG_NVMEM_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_ROCKCHIP_OTP=m
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 CONFIG_NVMEM_ZYNQMP=y
@@ -5623,10 +5623,6 @@ CONFIG_PM=y
 CONFIG_PNFS_BLOCK=m
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER10_CPU is not set
-# CONFIG_POWER7_CPU is not set
-# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
 CONFIG_POWERCAP=y
 CONFIG_POWER_MLXBF=m
 CONFIG_POWER_RESET_AS3722=y
@@ -6380,7 +6376,7 @@ CONFIG_SC_GCC_7280=y
 CONFIG_SC_GCC_8280XP=m
 CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
-# CONFIG_SC_GPUCC_8280XP is not set
+CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SCHED_CLUSTER is not set
 CONFIG_SCHED_CORE=y
@@ -7392,7 +7388,7 @@ CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 # CONFIG_SND_SOC_SC7180:
 CONFIG_SND_SOC_SC7180=m
 # CONFIG_SND_SOC_SC7280 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
+CONFIG_SND_SOC_SC8280XP=m
 CONFIG_SND_SOC_SDM845=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -7403,7 +7399,6 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
 # CONFIG_SND_SOC_SNOW is not set
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE is not set
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
 # CONFIG_SND_SOC_SOF_APOLLOLAKE is not set
 # CONFIG_SND_SOC_SOF_BAYTRAIL is not set
@@ -9076,7 +9071,6 @@ CONFIG_WWAN_HWSIM=m
 CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
-# CONFIG_X86_AMD_PSTATE_UT is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_MCELOG_LEGACY=y
@@ -9089,7 +9083,6 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
-CONFIG_XEN_PV_MSR_SAFE=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
 # CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
 CONFIG_XEN_VIRTIO=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 322764005..17adef3ed 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2156,7 +2156,7 @@ CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI=y
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 CONFIG_EMAC_ROCKCHIP=m
 # CONFIG_EMBEDDED is not set
@@ -3590,7 +3590,7 @@ CONFIG_KEYBOARD_IMX_SC_KEY=m
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_PINEPHONE is not set
+CONFIG_KEYBOARD_PINEPHONE=m
 CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
@@ -5009,7 +5009,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -5114,19 +5114,19 @@ CONFIG_NVMEM_APPLE_EFUSES=m
 CONFIG_NVMEM_IMX_OCOTP=m
 CONFIG_NVMEM_IMX_OCOTP_SCU=m
 CONFIG_NVMEM_LAYERSCAPE_SFP=m
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
+CONFIG_NVMEM_MESON_EFUSE=m
+CONFIG_NVMEM_MESON_MX_EFUSE=m
 CONFIG_NVMEM_QCOM_QFPROM=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
+CONFIG_NVMEM_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_ROCKCHIP_OTP=m
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 CONFIG_NVMEM_ZYNQMP=y
@@ -5602,10 +5602,6 @@ CONFIG_PM=y
 CONFIG_PNFS_BLOCK=m
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER10_CPU is not set
-# CONFIG_POWER7_CPU is not set
-# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
 CONFIG_POWERCAP=y
 CONFIG_POWER_MLXBF=m
 CONFIG_POWER_RESET_AS3722=y
@@ -6359,7 +6355,7 @@ CONFIG_SC_GCC_7280=y
 CONFIG_SC_GCC_8280XP=m
 CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
-# CONFIG_SC_GPUCC_8280XP is not set
+CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SCHED_CLUSTER is not set
 CONFIG_SCHED_CORE=y
@@ -7370,7 +7366,7 @@ CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 # CONFIG_SND_SOC_SC7180:
 CONFIG_SND_SOC_SC7180=m
 # CONFIG_SND_SOC_SC7280 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
+CONFIG_SND_SOC_SC8280XP=m
 CONFIG_SND_SOC_SDM845=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -7381,7 +7377,6 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
 # CONFIG_SND_SOC_SNOW is not set
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE is not set
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
 # CONFIG_SND_SOC_SOF_APOLLOLAKE is not set
 # CONFIG_SND_SOC_SOF_BAYTRAIL is not set
@@ -9053,7 +9048,6 @@ CONFIG_WWAN_HWSIM=m
 CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
-# CONFIG_X86_AMD_PSTATE_UT is not set
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_MCELOG_LEGACY=y
@@ -9066,7 +9060,6 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
-CONFIG_XEN_PV_MSR_SAFE=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
 # CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
 CONFIG_XEN_VIRTIO=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 5d6211535..364832186 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -369,8 +369,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
-CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARMADA_37XX_RWTM_MBOX=m
@@ -2165,7 +2163,7 @@ CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI=y
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 CONFIG_EMAC_ROCKCHIP=m
 # CONFIG_EMBEDDED is not set
@@ -3568,7 +3566,7 @@ CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_NVEC=y
 CONFIG_KEYBOARD_OMAP4=m
 # CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_PINEPHONE is not set
+CONFIG_KEYBOARD_PINEPHONE=m
 CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_PXA27x=y
 CONFIG_KEYBOARD_QT1050=m
@@ -5030,7 +5028,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -5126,19 +5124,19 @@ CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
+CONFIG_NVMEM_MESON_EFUSE=m
+CONFIG_NVMEM_MESON_MX_EFUSE=m
 CONFIG_NVMEM_QCOM_QFPROM=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
+CONFIG_NVMEM_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_ROCKCHIP_OTP=m
 CONFIG_NVMEM_SNVS_LPGPR=m
 CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 # CONFIG_NVME_RDMA is not set
@@ -5630,10 +5628,6 @@ CONFIG_PM_TRACE=y
 CONFIG_PM=y
 CONFIG_PNFS_BLOCK=m
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER10_CPU is not set
-# CONFIG_POWER7_CPU is not set
-# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
 CONFIG_POWER_AVS_OMAP_CLASS3=y
 CONFIG_POWER_AVS_OMAP=y
 CONFIG_POWERCAP=y
@@ -7192,7 +7186,6 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
 # CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
 # CONFIG_SND_SOC_AMD_YC_MACH is not set
-CONFIG_SND_SOC_APPLE_MCA=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
 CONFIG_SND_SOC_AW8738=m
@@ -7431,7 +7424,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 # CONFIG_SND_SOC_SC7180:
 CONFIG_SND_SOC_SC7180=m
 # CONFIG_SND_SOC_SC7280 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
+CONFIG_SND_SOC_SC8280XP=m
 # CONFIG_SND_SOC_SDM845 is not set
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -7442,7 +7435,6 @@ CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE is not set
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
 # CONFIG_SND_SOC_SOF_APOLLOLAKE is not set
 # CONFIG_SND_SOC_SOF_BAYTRAIL is not set
@@ -9189,7 +9181,6 @@ CONFIG_WWAN_HWSIM=m
 CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
-# CONFIG_X86_AMD_PSTATE_UT is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_MCELOG_LEGACY=y
@@ -9202,7 +9193,6 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
-CONFIG_XEN_PV_MSR_SAFE=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
 # CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
 CONFIG_XEN_VIRTIO=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 84e2713be..897457e00 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -369,8 +369,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
-CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARMADA_37XX_RWTM_MBOX=m
@@ -2158,7 +2156,7 @@ CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI=y
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 CONFIG_EMAC_ROCKCHIP=m
 # CONFIG_EMBEDDED is not set
@@ -3551,7 +3549,7 @@ CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_NVEC=y
 CONFIG_KEYBOARD_OMAP4=m
 # CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_PINEPHONE is not set
+CONFIG_KEYBOARD_PINEPHONE=m
 CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_PXA27x=y
 CONFIG_KEYBOARD_QT1050=m
@@ -5012,7 +5010,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -5108,19 +5106,19 @@ CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
+CONFIG_NVMEM_MESON_EFUSE=m
+CONFIG_NVMEM_MESON_MX_EFUSE=m
 CONFIG_NVMEM_QCOM_QFPROM=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
+CONFIG_NVMEM_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_ROCKCHIP_OTP=m
 CONFIG_NVMEM_SNVS_LPGPR=m
 CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 # CONFIG_NVME_RDMA is not set
@@ -5611,10 +5609,6 @@ CONFIG_PM_TRACE=y
 CONFIG_PM=y
 CONFIG_PNFS_BLOCK=m
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER10_CPU is not set
-# CONFIG_POWER7_CPU is not set
-# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
 CONFIG_POWER_AVS_OMAP_CLASS3=y
 CONFIG_POWER_AVS_OMAP=y
 CONFIG_POWERCAP=y
@@ -7172,7 +7166,6 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
 # CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
 # CONFIG_SND_SOC_AMD_YC_MACH is not set
-CONFIG_SND_SOC_APPLE_MCA=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
 CONFIG_SND_SOC_AW8738=m
@@ -7411,7 +7404,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 # CONFIG_SND_SOC_SC7180:
 CONFIG_SND_SOC_SC7180=m
 # CONFIG_SND_SOC_SC7280 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
+CONFIG_SND_SOC_SC8280XP=m
 # CONFIG_SND_SOC_SDM845 is not set
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -7422,7 +7415,6 @@ CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE is not set
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
 # CONFIG_SND_SOC_SOF_APOLLOLAKE is not set
 # CONFIG_SND_SOC_SOF_BAYTRAIL is not set
@@ -9168,7 +9160,6 @@ CONFIG_WWAN_HWSIM=m
 CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
-# CONFIG_X86_AMD_PSTATE_UT is not set
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_MCELOG_LEGACY=y
@@ -9181,7 +9172,6 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
-CONFIG_XEN_PV_MSR_SAFE=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
 # CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
 CONFIG_XEN_VIRTIO=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 06ce9443a..48298249a 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -361,8 +361,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
-CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARMADA_37XX_RWTM_MBOX=m
@@ -2119,7 +2117,7 @@ CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI=y
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 CONFIG_EMAC_ROCKCHIP=m
 # CONFIG_EMBEDDED is not set
@@ -3502,7 +3500,7 @@ CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_PINEPHONE is not set
+CONFIG_KEYBOARD_PINEPHONE=m
 CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
@@ -4932,7 +4930,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -5026,19 +5024,19 @@ CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
+CONFIG_NVMEM_MESON_EFUSE=m
+CONFIG_NVMEM_MESON_MX_EFUSE=m
 CONFIG_NVMEM_QCOM_QFPROM=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
+CONFIG_NVMEM_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_ROCKCHIP_OTP=m
 CONFIG_NVMEM_SNVS_LPGPR=m
 CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 # CONFIG_NVME_RDMA is not set
@@ -5505,10 +5503,6 @@ CONFIG_PM_TRACE=y
 CONFIG_PM=y
 CONFIG_PNFS_BLOCK=m
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER10_CPU is not set
-# CONFIG_POWER7_CPU is not set
-# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
 CONFIG_POWERCAP=y
 CONFIG_POWER_MLXBF=m
 CONFIG_POWER_RESET_AS3722=y
@@ -7002,7 +6996,6 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
 # CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
 # CONFIG_SND_SOC_AMD_YC_MACH is not set
-CONFIG_SND_SOC_APPLE_MCA=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
 CONFIG_SND_SOC_AW8738=m
@@ -7234,7 +7227,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 # CONFIG_SND_SOC_SC7180:
 CONFIG_SND_SOC_SC7180=m
 # CONFIG_SND_SOC_SC7280 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
+CONFIG_SND_SOC_SC8280XP=m
 # CONFIG_SND_SOC_SDM845 is not set
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -7245,7 +7238,6 @@ CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE is not set
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
 # CONFIG_SND_SOC_SOF_APOLLOLAKE is not set
 # CONFIG_SND_SOC_SOF_BAYTRAIL is not set
@@ -8937,7 +8929,6 @@ CONFIG_WWAN_HWSIM=m
 CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
-# CONFIG_X86_AMD_PSTATE_UT is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_MCELOG_LEGACY=y
@@ -8950,7 +8941,6 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
-CONFIG_XEN_PV_MSR_SAFE=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
 # CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
 CONFIG_XEN_VIRTIO=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index d0b5152a7..4e6333703 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -361,8 +361,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
-CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARMADA_37XX_RWTM_MBOX=m
@@ -2112,7 +2110,7 @@ CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI=y
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 CONFIG_EMAC_ROCKCHIP=m
 # CONFIG_EMBEDDED is not set
@@ -3485,7 +3483,7 @@ CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_PINEPHONE is not set
+CONFIG_KEYBOARD_PINEPHONE=m
 CONFIG_KEYBOARD_PMIC8XXX=m
 CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
@@ -4914,7 +4912,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -5008,19 +5006,19 @@ CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
+CONFIG_NVMEM_MESON_EFUSE=m
+CONFIG_NVMEM_MESON_MX_EFUSE=m
 CONFIG_NVMEM_QCOM_QFPROM=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
+CONFIG_NVMEM_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_ROCKCHIP_OTP=m
 CONFIG_NVMEM_SNVS_LPGPR=m
 CONFIG_NVMEM_SPMI_SDAM=m
 CONFIG_NVMEM_STM32_ROMEM=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 # CONFIG_NVME_RDMA is not set
@@ -5486,10 +5484,6 @@ CONFIG_PM_TRACE=y
 CONFIG_PM=y
 CONFIG_PNFS_BLOCK=m
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER10_CPU is not set
-# CONFIG_POWER7_CPU is not set
-# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
 CONFIG_POWERCAP=y
 CONFIG_POWER_MLXBF=m
 CONFIG_POWER_RESET_AS3722=y
@@ -6982,7 +6976,6 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
 # CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
 # CONFIG_SND_SOC_AMD_YC_MACH is not set
-CONFIG_SND_SOC_APPLE_MCA=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
 CONFIG_SND_SOC_AW8738=m
@@ -7214,7 +7207,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 # CONFIG_SND_SOC_SC7180:
 CONFIG_SND_SOC_SC7180=m
 # CONFIG_SND_SOC_SC7280 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
+CONFIG_SND_SOC_SC8280XP=m
 # CONFIG_SND_SOC_SDM845 is not set
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -7225,7 +7218,6 @@ CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE is not set
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
 # CONFIG_SND_SOC_SOF_APOLLOLAKE is not set
 # CONFIG_SND_SOC_SOF_BAYTRAIL is not set
@@ -8916,7 +8908,6 @@ CONFIG_WWAN_HWSIM=m
 CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
-# CONFIG_X86_AMD_PSTATE_UT is not set
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_MCELOG_LEGACY=y
@@ -8929,7 +8920,6 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
-CONFIG_XEN_PV_MSR_SAFE=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
 # CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
 CONFIG_XEN_VIRTIO=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 4da7bd8d8..db84cd874 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -278,8 +278,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
-CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -1682,7 +1680,7 @@ CONFIG_EFI_PGT_DUMP=y
 CONFIG_EFI_SECRET=m
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_TEST=m
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 # CONFIG_EMBEDDED is not set
 # CONFIG_ENA_ETHERNET is not set
@@ -3660,7 +3658,6 @@ CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSE102X=m
 CONFIG_MSI_BITMAP_SELFTEST=y
-# CONFIG_MSM_GCC_8909 is not set
 # CONFIG_MSM_GCC_8939 is not set
 # CONFIG_MSM_GCC_8953 is not set
 # CONFIG_MSM_GPUCC_8998 is not set
@@ -4274,7 +4271,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -4371,15 +4368,11 @@ CONFIG_NVDIMM_PFN=y
 CONFIG_NVME_AUTH=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
 # CONFIG_NVMEM_QCOM_QFPROM is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 CONFIG_NVME_RDMA=m
@@ -5301,7 +5294,6 @@ CONFIG_SCD30_I2C=m
 CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 # CONFIG_SCF_TORTURE_TEST is not set
-# CONFIG_SC_GPUCC_8280XP is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
@@ -6015,7 +6007,6 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
 # CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
 # CONFIG_SND_SOC_AMD_YC_MACH is not set
-CONFIG_SND_SOC_APPLE_MCA=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_AW8738=m
@@ -6241,7 +6232,6 @@ CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 is not set
 # CONFIG_SND_SOC_SC7180:
 # CONFIG_SND_SOC_SC7180 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -6252,7 +6242,6 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
 # CONFIG_SND_SOC_SNOW is not set
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE is not set
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
 # CONFIG_SND_SOC_SOF_APOLLOLAKE is not set
 # CONFIG_SND_SOC_SOF_BAYTRAIL is not set
@@ -7674,7 +7663,6 @@ CONFIG_WWAN_HWSIM=m
 CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
-# CONFIG_X86_AMD_PSTATE_UT is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_MCELOG_LEGACY=y
@@ -7686,7 +7674,6 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
-CONFIG_XEN_PV_MSR_SAFE=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
 # CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
 CONFIG_XEN_VIRTIO=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 3e073fa8c..4353a3dc4 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -278,8 +278,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
-CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -1673,7 +1671,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_EFI_SECRET=m
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_TEST=m
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 # CONFIG_EMBEDDED is not set
 # CONFIG_ENA_ETHERNET is not set
@@ -3640,7 +3638,6 @@ CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSE102X=m
 CONFIG_MSI_BITMAP_SELFTEST=y
-# CONFIG_MSM_GCC_8909 is not set
 # CONFIG_MSM_GCC_8939 is not set
 # CONFIG_MSM_GCC_8953 is not set
 # CONFIG_MSM_GPUCC_8998 is not set
@@ -4254,7 +4251,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -4351,15 +4348,11 @@ CONFIG_NVDIMM_PFN=y
 CONFIG_NVME_AUTH=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
 # CONFIG_NVMEM_QCOM_QFPROM is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 CONFIG_NVME_RDMA=m
@@ -5280,7 +5273,6 @@ CONFIG_SCD30_I2C=m
 CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 # CONFIG_SCF_TORTURE_TEST is not set
-# CONFIG_SC_GPUCC_8280XP is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
@@ -5993,7 +5985,6 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
 # CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
 # CONFIG_SND_SOC_AMD_YC_MACH is not set
-CONFIG_SND_SOC_APPLE_MCA=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_AW8738=m
@@ -6219,7 +6210,6 @@ CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 is not set
 # CONFIG_SND_SOC_SC7180:
 # CONFIG_SND_SOC_SC7180 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -6230,7 +6220,6 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
 # CONFIG_SND_SOC_SNOW is not set
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE is not set
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
 # CONFIG_SND_SOC_SOF_APOLLOLAKE is not set
 # CONFIG_SND_SOC_SOF_BAYTRAIL is not set
@@ -7651,7 +7640,6 @@ CONFIG_WWAN_HWSIM=m
 CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
-# CONFIG_X86_AMD_PSTATE_UT is not set
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_MCELOG_LEGACY=y
@@ -7663,7 +7651,6 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
-CONFIG_XEN_PV_MSR_SAFE=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
 # CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
 CONFIG_XEN_VIRTIO=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 8d347b6b2..1669a9854 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -281,8 +281,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
-CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -1688,7 +1686,7 @@ CONFIG_EFI_PGT_DUMP=y
 CONFIG_EFI_SECRET=m
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_TEST=m
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 # CONFIG_EMBEDDED is not set
 # CONFIG_ENA_ETHERNET is not set
@@ -3642,7 +3640,6 @@ CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSE102X=m
-# CONFIG_MSM_GCC_8909 is not set
 # CONFIG_MSM_GCC_8939 is not set
 # CONFIG_MSM_GCC_8953 is not set
 # CONFIG_MSM_GPUCC_8998 is not set
@@ -4254,7 +4251,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 # CONFIG_N_GSM is not set
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -4350,15 +4347,11 @@ CONFIG_NUMA=y
 CONFIG_NVME_AUTH=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
 # CONFIG_NVMEM_QCOM_QFPROM is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 CONFIG_NVME_RDMA=m
@@ -4659,10 +4652,6 @@ CONFIG_PM_TRACE=y
 CONFIG_PM=y
 CONFIG_PNFS_BLOCK=m
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER10_CPU is not set
-# CONFIG_POWER7_CPU is not set
-# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
 CONFIG_POWERCAP=y
 CONFIG_POWER_MLXBF=m
 # CONFIG_POWER_RESET_BRCMKONA is not set
@@ -5246,7 +5235,6 @@ CONFIG_SCD30_I2C=m
 CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 # CONFIG_SCF_TORTURE_TEST is not set
-# CONFIG_SC_GPUCC_8280XP is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_BOOK=y
 CONFIG_SCHED_CLUSTER=y
@@ -5963,7 +5951,6 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
 # CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
 # CONFIG_SND_SOC_AMD_YC_MACH is not set
-CONFIG_SND_SOC_APPLE_MCA=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_AW8738=m
@@ -6189,7 +6176,6 @@ CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 is not set
 # CONFIG_SND_SOC_SC7180:
 # CONFIG_SND_SOC_SC7180 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -6200,7 +6186,6 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
 # CONFIG_SND_SOC_SNOW is not set
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE is not set
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
 # CONFIG_SND_SOC_SOF_APOLLOLAKE is not set
 # CONFIG_SND_SOC_SOF_BAYTRAIL is not set
@@ -7632,7 +7617,6 @@ CONFIG_WWAN_HWSIM=m
 CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
-# CONFIG_X86_AMD_PSTATE_UT is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_MCELOG_LEGACY=y
@@ -7644,7 +7628,6 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
-CONFIG_XEN_PV_MSR_SAFE=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
 # CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
 CONFIG_XEN_VIRTIO=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index be9d9b4df..7990204b6 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -281,8 +281,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
-CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -1679,7 +1677,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_EFI_SECRET=m
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_TEST=m
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 # CONFIG_EMBEDDED is not set
 # CONFIG_ENA_ETHERNET is not set
@@ -3622,7 +3620,6 @@ CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSE102X=m
-# CONFIG_MSM_GCC_8909 is not set
 # CONFIG_MSM_GCC_8939 is not set
 # CONFIG_MSM_GCC_8953 is not set
 # CONFIG_MSM_GPUCC_8998 is not set
@@ -4234,7 +4231,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 # CONFIG_N_GSM is not set
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -4330,15 +4327,11 @@ CONFIG_NUMA=y
 CONFIG_NVME_AUTH=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
 # CONFIG_NVMEM_QCOM_QFPROM is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 CONFIG_NVME_RDMA=m
@@ -4638,10 +4631,6 @@ CONFIG_PM_TRACE=y
 CONFIG_PM=y
 CONFIG_PNFS_BLOCK=m
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER10_CPU is not set
-# CONFIG_POWER7_CPU is not set
-# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
 CONFIG_POWERCAP=y
 CONFIG_POWER_MLXBF=m
 # CONFIG_POWER_RESET_BRCMKONA is not set
@@ -5225,7 +5214,6 @@ CONFIG_SCD30_I2C=m
 CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 # CONFIG_SCF_TORTURE_TEST is not set
-# CONFIG_SC_GPUCC_8280XP is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_BOOK=y
 CONFIG_SCHED_CLUSTER=y
@@ -5941,7 +5929,6 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
 # CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
 # CONFIG_SND_SOC_AMD_YC_MACH is not set
-CONFIG_SND_SOC_APPLE_MCA=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_AW8738=m
@@ -6167,7 +6154,6 @@ CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 is not set
 # CONFIG_SND_SOC_SC7180:
 # CONFIG_SND_SOC_SC7180 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -6178,7 +6164,6 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
 # CONFIG_SND_SOC_SNOW is not set
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE is not set
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
 # CONFIG_SND_SOC_SOF_APOLLOLAKE is not set
 # CONFIG_SND_SOC_SOF_BAYTRAIL is not set
@@ -7609,7 +7594,6 @@ CONFIG_WWAN_HWSIM=m
 CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
-# CONFIG_X86_AMD_PSTATE_UT is not set
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_X86_MCELOG_LEGACY=y
@@ -7621,7 +7605,6 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
-CONFIG_XEN_PV_MSR_SAFE=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
 # CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
 CONFIG_XEN_VIRTIO=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index fd30b62d5..cb9e89c2b 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -315,8 +315,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
-CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -1842,7 +1840,7 @@ CONFIG_EFIVAR_FS=y
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 # CONFIG_EFI_VARS_PSTORE is not set
 CONFIG_EFI=y
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 # CONFIG_EISA is not set
 # CONFIG_EMBEDDED is not set
@@ -3956,7 +3954,6 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_MSE102X=m
 CONFIG_MSI_LAPTOP=m
 CONFIG_MSI_WMI=m
-# CONFIG_MSM_GCC_8909 is not set
 # CONFIG_MSM_GCC_8939 is not set
 # CONFIG_MSM_GCC_8953 is not set
 # CONFIG_MSM_GPUCC_8998 is not set
@@ -4577,7 +4574,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -4686,15 +4683,11 @@ CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
 CONFIG_NVME_AUTH=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
 # CONFIG_NVMEM_QCOM_QFPROM is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 CONFIG_NVME_RDMA=m
@@ -5052,10 +5045,6 @@ CONFIG_PNPACPI=y
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 CONFIG_PNP=y
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER10_CPU is not set
-# CONFIG_POWER7_CPU is not set
-# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
 CONFIG_POWERCAP=y
 CONFIG_POWER_MLXBF=m
 # CONFIG_POWER_RESET_BRCMKONA is not set
@@ -5644,7 +5633,6 @@ CONFIG_SCD30_I2C=m
 CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 # CONFIG_SCF_TORTURE_TEST is not set
-# CONFIG_SC_GPUCC_8280XP is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
@@ -6387,7 +6375,6 @@ CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
 CONFIG_SND_SOC_AMD_ST_ES8336_MACH=m
 CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
 CONFIG_SND_SOC_AMD_YC_MACH=m
-CONFIG_SND_SOC_APPLE_MCA=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_AW8738=m
@@ -6614,7 +6601,6 @@ CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 is not set
 # CONFIG_SND_SOC_SC7180:
 # CONFIG_SND_SOC_SC7180 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -6626,7 +6612,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE:
 CONFIG_SND_SOC_SOF_ALDERLAKE=m
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
+CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
 CONFIG_SND_SOC_SOF_AMD_RENOIR=m
 CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
 # CONFIG_SND_SOC_SOF_APOLLOLAKE:
@@ -8113,7 +8099,7 @@ CONFIG_X86_ACPI_CPUFREQ_CPB=y
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_AMD_FREQ_SENSITIVITY=m
 CONFIG_X86_AMD_PLATFORM_DEVICE=y
-# CONFIG_X86_AMD_PSTATE_UT is not set
+CONFIG_X86_AMD_PSTATE_UT=m
 CONFIG_X86_AMD_PSTATE=y
 CONFIG_X86_ANDROID_TABLETS=m
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 9e5d5b7df..e72ab798c 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -315,8 +315,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
-CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -1833,7 +1831,7 @@ CONFIG_EFIVAR_FS=y
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 # CONFIG_EFI_VARS_PSTORE is not set
 CONFIG_EFI=y
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
 # CONFIG_EISA is not set
 # CONFIG_EMBEDDED is not set
@@ -3937,7 +3935,6 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_MSE102X=m
 CONFIG_MSI_LAPTOP=m
 CONFIG_MSI_WMI=m
-# CONFIG_MSM_GCC_8909 is not set
 # CONFIG_MSM_GCC_8939 is not set
 # CONFIG_MSM_GCC_8953 is not set
 # CONFIG_MSM_GPUCC_8998 is not set
@@ -4558,7 +4555,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-# CONFIG_NGBE is not set
+CONFIG_NGBE=m
 CONFIG_N_GSM=m
 CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
@@ -4667,15 +4664,11 @@ CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
 CONFIG_NVME_AUTH=y
 CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
-# CONFIG_NVMEM_MESON_EFUSE is not set
-# CONFIG_NVMEM_MESON_MX_EFUSE is not set
 # CONFIG_NVMEM_QCOM_QFPROM is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
-# CONFIG_NVMEM_ROCKCHIP_EFUSE is not set
-# CONFIG_NVMEM_ROCKCHIP_OTP is not set
 CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_U_BOOT_ENV is not set
+CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
 CONFIG_NVME_RDMA=m
@@ -5032,10 +5025,6 @@ CONFIG_PNPACPI=y
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 CONFIG_PNP=y
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER10_CPU is not set
-# CONFIG_POWER7_CPU is not set
-# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
 CONFIG_POWERCAP=y
 CONFIG_POWER_MLXBF=m
 # CONFIG_POWER_RESET_BRCMKONA is not set
@@ -5624,7 +5613,6 @@ CONFIG_SCD30_I2C=m
 CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 # CONFIG_SCF_TORTURE_TEST is not set
-# CONFIG_SC_GPUCC_8280XP is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
@@ -6366,7 +6354,6 @@ CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
 CONFIG_SND_SOC_AMD_ST_ES8336_MACH=m
 CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
 CONFIG_SND_SOC_AMD_YC_MACH=m
-CONFIG_SND_SOC_APPLE_MCA=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_AW8738=m
@@ -6593,7 +6580,6 @@ CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 is not set
 # CONFIG_SND_SOC_SC7180:
 # CONFIG_SND_SOC_SC7180 is not set
-# CONFIG_SND_SOC_SC8280XP is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -6605,7 +6591,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
 CONFIG_SND_SOC_SOF_ACPI=m
 # CONFIG_SND_SOC_SOF_ALDERLAKE:
 CONFIG_SND_SOC_SOF_ALDERLAKE=m
-# CONFIG_SND_SOC_SOF_AMD_REMBRANDT is not set
+CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
 CONFIG_SND_SOC_SOF_AMD_RENOIR=m
 CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
 # CONFIG_SND_SOC_SOF_APOLLOLAKE:
@@ -8091,7 +8077,7 @@ CONFIG_X86_ACPI_CPUFREQ_CPB=y
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_AMD_FREQ_SENSITIVITY=m
 CONFIG_X86_AMD_PLATFORM_DEVICE=y
-# CONFIG_X86_AMD_PSTATE_UT is not set
+CONFIG_X86_AMD_PSTATE_UT=m
 CONFIG_X86_AMD_PSTATE=y
 CONFIG_X86_ANDROID_TABLETS=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
diff --git a/kernel.spec b/kernel.spec
index fdc7f6644..375f06cdf 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -123,13 +123,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.1.0
 %define patchversion 6.1
-%define pkgrelease 0.rc7.20221130git01f856ae6d0c.53
+%define pkgrelease 0.rc7.20221201gitef4d3ea40565.54
 %define kversion 6
-%define tarfile_release 6.1-rc7-101-g01f856ae6d0c
+%define tarfile_release 6.1-rc7-103-gef4d3ea40565
 # This is needed to do merge window version magic
 %define patchlevel 1
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.20221130git01f856ae6d0c.53%{?buildid}%{?dist}
+%define specrelease 0.rc7.20221201gitef4d3ea40565.54%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.1.0
 
@@ -3191,6 +3191,12 @@ fi
 #
 #
 %changelog
+* Thu Dec 01 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc7.ef4d3ea40565.54]
+- Adjust path to compressed vmlinux kernel image for s390x (Justin M. Forbes) [2149273]
+- Fedora config updates for 6.1 (Justin M. Forbes)
+- redhat: genlog.sh should expect genlog.py in the current directory (Patrick Talbert)
+- Linux v6.1.0-0.rc7.ef4d3ea40565
+
 * Mon Nov 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc6.46]
 - Linux v6.1.0-0.rc6
 
diff --git a/sources b/sources
index e3d9520ee..6562f9a2f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.1-rc7-101-g01f856ae6d0c.tar.xz) = cb6dde6f54aca61f268e04d832aa974ee2514783a4e76349ce72739d22ac37d00d1f43b3693455c70d9712f9e1176e44c7e62feb2d74007a658759f0954e2a5e
-SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 78c87ed9bcb33a292b991a2d965d8132c09309f36b6eae1cdf5c721654b20803094a2ec6eb4ad1f2d885094e4973b2457906019c8b99833a55a4547a28296976
-SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = c58c57bcc54ad7a707bed061e470c397a6c83c9357c8d2d6ab5091c9f3daaf1a2367278ae12430ec39416fc22a4e643b34b057b1c44f972cad0ffcb82e6bc245
+SHA512 (linux-6.1-rc7-103-gef4d3ea40565.tar.xz) = 2710adbbd87c748533350d08637803383ad32860a7a829c6adfaa07c6ef76c4a43d46b97ff96665ba23a7479e9f1f62b5aa1d530db83ecea0f49aac5e06b3663
+SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = b3dee1f82ccb9d2eea22cda4eea40a4605a3308acff3f15c32166b79a02a557af2881ff2c17817c9bf43b5cc4ab4cdc70dc92d32229e14aace0180536d7a5a58
+SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 52b7720d83f6c259dfca8ab29ff51f72b817a54bf93aaf9beabb968c5e7d9f5de9f8542f2675a80c737be2b98d9872480e464a7ee4bd189f063b3a0004296b27