Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc4.20210804gitd5ad8ec3cfb5.36.vanilla.1.fc34

1 files changed, 10 insertions, 13 deletions

diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index a756214c6..db4842fdc 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -281,11 +281,8 @@ CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_PTR_AUTH_KERNEL=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
-# CONFIG_ARM_FFA_TRANSPORT is not set
-CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=2
 # CONFIG_ARM_MHU_V2 is not set
 CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
@@ -513,10 +510,10 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
-# CONFIG_BLK_CGROUP_FC_APPID is not set
+CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
-# CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_CGROUP_IOPRIO=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_BLK_CMDLINE_PARSER is not set
 CONFIG_BLK_DEBUG_FS=y
@@ -1284,7 +1281,7 @@ CONFIG_DELL_SMO8800=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_WMI=m
-# CONFIG_DELL_WMI_PRIVACY is not set
+CONFIG_DELL_WMI_PRIVACY=y
 CONFIG_DELL_WMI_SYSMAN=m
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
@@ -2540,7 +2537,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
 CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IRDMA is not set
+CONFIG_INFINIBAND_IRDMA=m
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_ISERT=m
 CONFIG_INFINIBAND=m
@@ -3000,7 +2997,7 @@ CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
 CONFIG_JOYSTICK_PSXPAD_SPI=m
 CONFIG_JOYSTICK_PXRC=m
-# CONFIG_JOYSTICK_QWIIC is not set
+CONFIG_JOYSTICK_QWIIC=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_SPACEBALL=m
 CONFIG_JOYSTICK_SPACEORB=m
@@ -4506,7 +4503,7 @@ CONFIG_OPTPROBES=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ORINOCO_USB=m
 CONFIG_OSF_PARTITION=y
-# CONFIG_OSNOISE_TRACER is not set
+CONFIG_OSNOISE_TRACER=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_METACOPY is not set
@@ -6238,7 +6235,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
-# CONFIG_SND_SOC_SSM2518 is not set
+CONFIG_SND_SOC_SSM2518=m
 # CONFIG_SND_SOC_SSM2602_I2C is not set
 # CONFIG_SND_SOC_SSM2602_SPI is not set
 CONFIG_SND_SOC_SSM4567=m
@@ -6660,7 +6657,7 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 CONFIG_THINKPAD_ACPI_VIDEO=y
-# CONFIG_THINKPAD_LMI is not set
+CONFIG_THINKPAD_LMI=m
 CONFIG_THRUSTMASTER_FF=y
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC0832 is not set
@@ -6686,7 +6683,7 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 CONFIG_TIME_NS=y
-# CONFIG_TIMERLAT_TRACER is not set
+CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9225 is not set
 # CONFIG_TINYDRM_ILI9341 is not set
@@ -7554,7 +7551,7 @@ CONFIG_WINBOND_840=m
 # CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_WIREGUARD=m
 CONFIG_WIRELESS_EXT=y
-# CONFIG_WIRELESS_HOTKEY is not set
+CONFIG_WIRELESS_HOTKEY=m
 CONFIG_WIRELESS=y
 CONFIG_WIZNET_BUS_ANY=y
 # CONFIG_WIZNET_BUS_DIRECT is not set