Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-0.rc7.20221201gitef4d3ea40565.54.vanilla.1.fc37

1 files changed, 5 insertions, 19 deletions

diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 7464729df..838ff28df 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