Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc7.20210416git7e25f40eab52.191.vanilla.1.fc34

1 files changed, 22 insertions, 17 deletions

diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index caa36ec58..48ee1874f 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -208,7 +208,6 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
 # CONFIG_ARM_MHU_V2 is not set
 CONFIG_ARM_SMCCC_SOC_ID=y
-# CONFIG_ARM_SMC_WATCHDOG is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
@@ -668,6 +667,7 @@ CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CLEANCACHE=y
+# CONFIG_CLK_GFM_LPASS_SM8250 is not set
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set
 # CONFIG_CLK_SIFIVE is not set
@@ -696,6 +696,7 @@ CONFIG_CMM=m
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
+# CONFIG_COMMON_CLK_FSL_FLEXSPI is not set
 CONFIG_COMMON_CLK_HI3516CV300=y
 CONFIG_COMMON_CLK_HI3519=y
 CONFIG_COMMON_CLK_HI3660=y
@@ -780,8 +781,8 @@ CONFIG_CRYPTO_AES_S390=m
 # CONFIG_CRYPTO_AES_TI is not set
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
 CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
@@ -847,7 +848,7 @@ CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_KEYWRAP is not set
-CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_KHAZAD is not set
 CONFIG_CRYPTO_LIB_BLAKE2S=m
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_CHACHA=m
@@ -874,7 +875,7 @@ CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SEED=m
+# CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1_S390=y
@@ -891,21 +892,19 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SKEIN is not set
-# CONFIG_CRYPTO_SM2 is not set
-CONFIG_CRYPTO_SM3_ARM64_CE=m
-# CONFIG_CRYPTO_SM3 is not set
-CONFIG_CRYPTO_SM4_ARM64_CE=m
-# CONFIG_CRYPTO_SM4 is not set
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_SM4=m
 # CONFIG_CRYPTO_SPECK is not set
 # CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_STATS=y
 # CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TEA=m
+# CONFIG_CRYPTO_TEA is not set
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_USER_API_AEAD=y
-CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
 CONFIG_CRYPTO_USER_API_HASH=y
 # CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
 CONFIG_CRYPTO_USER_API_RNG=y
@@ -1762,7 +1761,7 @@ CONFIG_HID_PETALYNX=m
 CONFIG_HID_PICOLCD=m
 CONFIG_HID_PID=y
 CONFIG_HID_PLANTRONICS=m
-# CONFIG_HID_PLAYSTATION is not set
+CONFIG_HID_PLAYSTATION=m
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HIDRAW=y
@@ -1891,7 +1890,7 @@ CONFIG_I2C_DIOLAN_U2C=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
 # CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_HID_ACPI is not set
+CONFIG_I2C_HID_ACPI=m
 # CONFIG_I2C_HID is not set
 # CONFIG_I2C_HID_OF_GOODIX is not set
 # CONFIG_I2C_HID_OF is not set
@@ -1966,6 +1965,7 @@ CONFIG_IEEE802154=m
 # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
 CONFIG_IEEE802154_SOCKET=m
 CONFIG_IFB=m
+# CONFIG_IFCVF is not set
 CONFIG_IGB_DCA=y
 CONFIG_IGB_HWMON=y
 CONFIG_IGB=m
@@ -2944,6 +2944,7 @@ CONFIG_MLX5_MPFS=y
 CONFIG_MLX5_SF=y
 CONFIG_MLX5_SW_STEERING=y
 # CONFIG_MLX5_TLS is not set
+# CONFIG_MLX5_VDPA_NET is not set
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLXBF_BOOTCTL is not set
@@ -3873,6 +3874,7 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 CONFIG_PKEY=m
 # CONFIG_PL320_MBOX is not set
 # CONFIG_PLATFORM_MHU is not set
+CONFIG_PLAYSTATION_FF=y
 # CONFIG_PLIP is not set
 # CONFIG_PLX_DMA is not set
 # CONFIG_PM_ADVANCED_DEBUG is not set
@@ -4372,6 +4374,7 @@ CONFIG_SATA_PMP=y
 # CONFIG_SBP_TARGET is not set
 # CONFIG_SC1200_WDT is not set
 # CONFIG_SCA3000 is not set
+# CONFIG_SC_CAMCC_7180 is not set
 # CONFIG_SCD30_CORE is not set
 # CONFIG_SCF_TORTURE_TEST is not set
 CONFIG_SCHED_AUTOGROUP=y
@@ -4482,6 +4485,7 @@ CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
 # CONFIG_SDIO_UART is not set
 # CONFIG_SDMA_VERBOSITY is not set
+# CONFIG_SDX_GCC_55 is not set
 # CONFIG_SECCOMP_CACHE_DEBUG is not set
 CONFIG_SECCOMP=y
 # CONFIG_SECONDARY_TRUSTED_KEYRING is not set
@@ -5946,8 +5950,9 @@ CONFIG_UWB_I1480U=m
 # CONFIG_VCNL3020 is not set
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
-# CONFIG_VDPA is not set
+CONFIG_VDPA=m
 # CONFIG_VDPA_MENU is not set
+# CONFIG_VDPA_SIM is not set
 # CONFIG_VEML6030 is not set
 # CONFIG_VEML6070 is not set
 CONFIG_VETH=m
@@ -5974,7 +5979,7 @@ CONFIG_VGA_CONSOLE=y
 CONFIG_VHOST_MENU=y
 CONFIG_VHOST_NET=m
 # CONFIG_VHOST_SCSI is not set
-# CONFIG_VHOST_VDPA is not set
+CONFIG_VHOST_VDPA=m
 CONFIG_VHOST_VSOCK=m
 # CONFIG_VIDEO_AD5820 is not set
 # CONFIG_VIDEO_ADP1653 is not set
@@ -6129,7 +6134,7 @@ CONFIG_VIRTIO_NET=m
 # CONFIG_VIRTIO_PCI is not set
 CONFIG_VIRTIO_PCI_LEGACY=y
 # CONFIG_VIRTIO_PMEM is not set
-# CONFIG_VIRTIO_VDPA is not set
+CONFIG_VIRTIO_VDPA=m
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y