Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc0.git4.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc0.git4.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc0.git4.1.vanilla.knurd.1.fc26kernel-4.15.0-0.rc0.git4.1.vanilla.knurd.1.fc25

1 files changed, 17 insertions, 1 deletions

diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 82b082d0b..8ffb8b577 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -502,6 +502,7 @@ CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_RTL=y
@@ -660,6 +661,8 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_CHARGER_SMB347 is not set
+# CONFIG_CHASH_SELFTEST is not set
+# CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CHECK_STACK=y
 CONFIG_CHELSIO_T1_1G=y
@@ -1029,6 +1032,7 @@ CONFIG_DNOTIFY=y
 CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 # CONFIG_DP83640_PHY is not set
+CONFIG_DP83822_PHY=m
 CONFIG_DP83848_PHY=m
 # CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
@@ -1056,6 +1060,7 @@ CONFIG_DRM_FBDEV_EMULATION=y
 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_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -1077,10 +1082,14 @@ CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_LVDS is not set
+CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
@@ -1093,7 +1102,8 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
-CONFIG_DRM_SIL_SII8620=m
+CONFIG_DRM_SII9234=m
+# CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SIS is not set
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_TINYDRM is not set
@@ -2000,6 +2010,7 @@ CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMI_PROC_INTERFACE is not set
 CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
@@ -2730,6 +2741,7 @@ CONFIG_MISDN_NETJET=m
 CONFIG_MISDN_SPEEDFAX=m
 CONFIG_MISDN_W6692=m
 CONFIG_MKISS=m
+CONFIG_MLX4_CORE_GEN2=y
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_EN=m
@@ -3112,6 +3124,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_NETROM=m
 CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_CBS=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_CODEL=m
 # CONFIG_NET_SCH_DEFAULT is not set
@@ -3424,6 +3437,7 @@ CONFIG_NORTEL_HERMES=m
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_NOUVEAU_DEBUG_MMU=y
 # CONFIG_NOZOMI is not set
 CONFIG_NR_CPUS=64
 CONFIG_NR_DEV_DAX=32768
@@ -3831,6 +3845,7 @@ CONFIG_REISERFS_PROC_INFO=y
 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_REMOTEPROC=m
+CONFIG_RENESAS_PHY=m
 CONFIG_RESET_ATTACK_MITIGATION=y
 # CONFIG_RESET_CONTROLLER is not set
 # CONFIG_RESET_HSDK_V1 is not set
@@ -5616,6 +5631,7 @@ CONFIG_VMCP=y
 CONFIG_VMLOGRDR=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
+CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS=m
 CONFIG_VSOCKMON=m
 # CONFIG_VT6655 is not set