Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc0.20210629gitc54b245d0118.3.vanilla.1.fc34

1 files changed, 14 insertions, 3 deletions

diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index c0dec0d6f..c9b2531c1 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -280,6 +280,7 @@ 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_MHU_V2 is not set
@@ -1065,7 +1066,9 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_AEAD is not set
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
+# CONFIG_CRYPTO_DEV_SL3516 is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -1073,7 +1076,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=y
+CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECDSA=y
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -1719,7 +1722,6 @@ CONFIG_EVM=y
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_EXFAT_FS=m
 # CONFIG_EXPERT is not set
-# CONFIG_EXPOLINE_OFF is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
@@ -2214,7 +2216,6 @@ CONFIG_HISI_HIKEY_USB=m
 CONFIG_HIST_TRIGGERS=y
 CONFIG_HMC425=m
 # CONFIG_HMC6352 is not set
-# CONFIG_HMC_DRV is not set
 CONFIG_HOLTEK_FF=y
 # CONFIG_HOSTAP is not set
 CONFIG_HOTPLUG_CPU=y
@@ -2463,6 +2464,7 @@ CONFIG_IMA_ARCH_POLICY=y
 CONFIG_IMA_DEFAULT_HASH="sha256"
 CONFIG_IMA_DEFAULT_HASH_SHA256=y
 # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
+# CONFIG_IMA_DISABLE_HTABLE is not set
 CONFIG_IMA_KEXEC=y
 CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
 # CONFIG_IMA_LOAD_X509 is not set
@@ -5020,6 +5022,7 @@ CONFIG_REGULATOR_MAX77650=m
 # CONFIG_REGULATOR_MAX77826 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8893 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MCP16502 is not set
 CONFIG_REGULATOR_MP5416=m
@@ -5036,6 +5039,8 @@ CONFIG_REGULATOR_MP886X=m
 # CONFIG_REGULATOR_PWM is not set
 # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
 CONFIG_REGULATOR_RT4801=m
+# CONFIG_REGULATOR_RT6160 is not set
+# CONFIG_REGULATOR_RT6245 is not set
 CONFIG_REGULATOR_RTMV20=m
 # CONFIG_REGULATOR_SLG51000 is not set
 # CONFIG_REGULATOR_SY8106A is not set
@@ -5306,6 +5311,7 @@ CONFIG_SCD30_SERIAL=m
 # CONFIG_SCF_TORTURE_TEST is not set
 # CONFIG_SC_GPUCC_7180 is not set
 CONFIG_SCHED_AUTOGROUP=y
+CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_MC_PRIO=y
 CONFIG_SCHED_MC=y
@@ -5495,6 +5501,7 @@ CONFIG_SENSORS_CORSAIR_CPRO=m
 CONFIG_SENSORS_CORSAIR_PSU=m
 CONFIG_SENSORS_DELL_SMM=m
 CONFIG_SENSORS_DME1737=m
+# CONFIG_SENSORS_DPS920AB is not set
 CONFIG_SENSORS_DRIVETEMP=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_DS620=m
@@ -5598,6 +5605,7 @@ CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_MLXREG_FAN=m
+# CONFIG_SENSORS_MP2888 is not set
 CONFIG_SENSORS_MP2975=m
 CONFIG_SENSORS_MR75203=m
 CONFIG_SENSORS_NCT6683=m
@@ -5612,6 +5620,7 @@ CONFIG_SENSORS_NZXT_KRAKEN2=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
+# CONFIG_SENSORS_PIM4328 is not set
 CONFIG_SENSORS_PM6764TR=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_POWR1220=m
@@ -5626,6 +5635,7 @@ CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
+# CONFIG_SENSORS_SHT4x is not set
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_SIS5595=m
 # CONFIG_SENSORS_SMM665 is not set
@@ -7240,6 +7250,7 @@ CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HI556=m
+# CONFIG_VIDEO_IMX208 is not set
 CONFIG_VIDEO_IMX214=m
 CONFIG_VIDEO_IMX219=m
 CONFIG_VIDEO_IMX258=m