Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.18.0-0.rc0.git3.1.vanilla.knurd.1.fc29kernel-4.18.0-0.rc0.git3.1.vanilla.knurd.1.fc28kernel-4.18.0-0.rc0.git3.1.vanilla.knurd.1.fc27

1 files changed, 33 insertions, 0 deletions

diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 452c337d6..c8fe243c2 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -827,6 +827,12 @@ CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=y
+# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS128L is not set
+# CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_AEGIS256 is not set
 CONFIG_CRYPTO_AES_S390=m
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES=y
@@ -890,6 +896,11 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_MORUS1280_AVX2 is not set
+# CONFIG_CRYPTO_MORUS1280 is not set
+# CONFIG_CRYPTO_MORUS1280_SSE2 is not set
+# CONFIG_CRYPTO_MORUS640 is not set
+# CONFIG_CRYPTO_MORUS640_SSE2 is not set
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_PAES_S390=m
 CONFIG_CRYPTO_PCBC=m
@@ -914,6 +925,7 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
+# CONFIG_CRYPTO_SM4_ARM64_CE is not set
 CONFIG_CRYPTO_SM4=m
 CONFIG_CRYPTO_SPECK=m
 CONFIG_CRYPTO_TEA=m
@@ -930,6 +942,7 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_ZSTD is not set
 CONFIG_CTC=m
 CONFIG_CTCM=m
 CONFIG_CUSE=m
@@ -1122,18 +1135,25 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 # CONFIG_DRM_ARCPGU is not set
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
+# CONFIG_DRM_CDNS_DSI is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
+# CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_EXYNOS_FIMC is not set
+# CONFIG_DRM_EXYNOS_GSC is not set
+# CONFIG_DRM_EXYNOS_ROTATOR is not set
+# CONFIG_DRM_EXYNOS_SCALER is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HISI_HIBMC=m
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_LEGACY is not set
@@ -1178,15 +1198,19 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SIS is not set
+# CONFIG_DRM_SUN6I_DSI is not set
 # CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
 CONFIG_DRM_UDL=m
+# CONFIG_DRM_V3D is not set
 # CONFIG_DRM_VBOXVIDEO is not set
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
+# CONFIG_DRM_XEN is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DS4424 is not set
@@ -1885,6 +1909,7 @@ CONFIG_I40EVF=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
 CONFIG_IBM_PARTITION=y
+# CONFIG_IBMVMC is not set
 CONFIG_ICE=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
@@ -2503,6 +2528,7 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 CONFIG_LEDS_CLASS_FLASH=m
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLEVO_MAIL=m
+# CONFIG_LEDS_CR0014114 is not set
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_IS31FL319X is not set
@@ -2510,6 +2536,7 @@ CONFIG_LEDS_IS31FL32XX=m
 # CONFIG_LEDS_KTD2692 is not set
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_LM3601X is not set
 # CONFIG_LEDS_LM3642 is not set
 CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
@@ -2930,6 +2957,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_DW_BLUEFIELD is not set
 # CONFIG_MMC is not set
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
@@ -5274,6 +5302,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 # CONFIG_TOUCHSCREEN_BU21013 is not set
 # CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
+# CONFIG_TOUCHSCREEN_CHIPONE_ICN8505 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
@@ -5378,6 +5407,7 @@ CONFIG_TUN=m
 CONFIG_TYPEC_FUSB302=m
 CONFIG_TYPEC=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
+# CONFIG_TYPEC_RT1711H is not set
 CONFIG_TYPEC_TCPCI=m
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TPS6598X=m
@@ -5457,6 +5487,7 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_DWC3_HOST is not set
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_DWC3_OF_SIMPLE is not set
+# CONFIG_USB_DWC3_QCOM is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_HCD=y
@@ -5751,6 +5782,7 @@ CONFIG_USB_WUSB_CBAF=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_HISTB is not set
 # CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_USB_XUSBATM=m
 CONFIG_USB=y
@@ -6039,6 +6071,7 @@ CONFIG_XFRM_USER=y
 CONFIG_XFRM=y
 # CONFIG_XFS_DEBUG is not set
 CONFIG_XFS_FS=m
+# CONFIG_XFS_ONLINE_REPAIR is not set
 CONFIG_XFS_ONLINE_SCRUB=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_QUOTA=y