Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/kernel

1 files changed, 24 insertions, 3 deletions

diff --git a/kernel-s390x.config b/kernel-s390x.config
index 0ef222680..cac9bab8c 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -677,6 +677,7 @@ CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHSC_SCH=m
+CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_CICADA_PHY=m
 CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG2 is not set
@@ -756,6 +757,7 @@ CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CRAMFS=m
+# CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
 CONFIG_CRASH=m
 CONFIG_CRC16=y
@@ -912,6 +914,7 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_KMEMLEAK_TEST is not set
@@ -1029,6 +1032,9 @@ CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_DRM_AMD_ACP=y
+# CONFIG_DRM_AMD_DC_FBC is not set
+# CONFIG_DRM_AMD_DC_PRE_VEGA is not set
+CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
@@ -1050,7 +1056,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 # CONFIG_DRM_I2C_ADV7511_CEC is not set
-CONFIG_DRM_I2C_ADV7511=m
+# CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
@@ -1500,6 +1506,7 @@ CONFIG_GREENASIA_FF=y
 # CONFIG_GREYBUS is not set
 # CONFIG_GS_FPGABOOT is not set
 CONFIG_GTP=m
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_HAMACHI=m
 CONFIG_HAMRADIO=y
 CONFIG_HANGCHECK_TIMER=m
@@ -1690,7 +1697,7 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 # CONFIG_HX711 is not set
 CONFIG_HYSDN_CAPI=y
 CONFIG_HYSDN=m
@@ -1941,6 +1948,7 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -2603,6 +2611,9 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
+# CONFIG_MESON_GX_PM_DOMAINS is not set
+# CONFIG_MESON_MX_EFUSE is not set
+# CONFIG_MESON_MX_SOCINFO is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -3423,6 +3434,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
+CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NTP_PPS=y
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
@@ -3605,9 +3617,12 @@ CONFIG_PHYLINK=m
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
+CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
+# CONFIG_PINCTRL_MESON_GXBB is not set
+# CONFIG_PINCTRL_MESON_GXL is not set
 CONFIG_PINCTRL_RK805=m
 # CONFIG_PINCTRL_SPRD is not set
 # CONFIG_PINCTRL_SPRD_SC9860 is not set
@@ -3709,6 +3724,7 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_GLINK_SSR is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QDIO=m
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -3856,6 +3872,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -4478,7 +4495,7 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
-# CONFIG_SND_BCD2000 is not set
+CONFIG_SND_BCD2000=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
@@ -4912,6 +4929,7 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TEE is not set
+# CONFIG_TEGRA_BPMP_THERMAL is not set
 CONFIG_TEHUTI=m
 CONFIG_TEKRAM_DONGLE=m
 CONFIG_TELCLOCK=m
@@ -4919,6 +4937,7 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_TEST_ASYNC_DRIVER_PROBE=m
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
@@ -5642,6 +5661,7 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS2805=m
 CONFIG_W1_SLAVE_DS28E04=m
+# CONFIG_W1_SLAVE_DS28E17 is not set
 CONFIG_W1_SLAVE_SMEM=m
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W83627HF_WDT=m
@@ -5712,6 +5732,7 @@ CONFIG_WM8350_WATCHDOG=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
+# CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_SUB_POLICY=y