Linux v4.12-6090-g9b51f04

1 files changed, 17 insertions, 0 deletions

diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index ef83e2237..e56708bae 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -196,6 +196,7 @@ CONFIG_ATH10K_DEBUGFS=y
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH5K=m
@@ -720,6 +721,7 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_CORDIC=m
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_CORTINA_PHY=m
 # CONFIG_CPU5_WDT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPUFREQ_DT is not set
@@ -786,6 +788,7 @@ CONFIG_CRYPTO_DES_S390=m
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
@@ -2462,6 +2465,7 @@ CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC802154=m
 CONFIG_MACB=m
 CONFIG_MACB_PCI=m
+CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MACHZ_WDT=m
 # CONFIG_MAC_PARTITION is not set
@@ -2477,6 +2481,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
 CONFIG_MANTIS_CORE=m
 CONFIG_MARCH_ZEC12=y
+CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_PHY=m
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX11100 is not set
@@ -2660,6 +2665,8 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_KSZ=m
+CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m
 CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_MIGRATION=y
@@ -2687,9 +2694,12 @@ CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_IPOIB=y
 CONFIG_MLX5_CORE=m
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_FPGA=y
 CONFIG_MLX5_INFINIBAND=m
 # CONFIG_MLX90614 is not set
 CONFIG_MLX_CPLD_PLATFORM=m
+CONFIG_MLXFW=m
 CONFIG_MLXSW_CORE_HWMON=y
 # CONFIG_MLXSW_CORE is not set
 CONFIG_MLXSW_CORE_THERMAL=y
@@ -3220,6 +3230,7 @@ CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_LOG_NETDEV=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFP=m
 # CONFIG_NFP_NET_DEBUG is not set
@@ -3646,6 +3657,8 @@ CONFIG_PWRSEQ_EMMC=m
 # CONFIG_PWRSEQ_SD8787 is not set
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000 is not set
+# CONFIG_QCA7000_SPI is not set
+# CONFIG_QCA7000_UART is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
@@ -3670,6 +3683,7 @@ CONFIG_QLGE=m
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
 CONFIG_QSEMI_PHY=m
+CONFIG_QTNFMAC_PEARL_PCIE=m
 CONFIG_QUOTACTL=y
 CONFIG_QUOTA_DEBUG=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -4098,6 +4112,7 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITYFS=y
+CONFIG_SECURITY_INFINIBAND=y
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_NETWORK=y
@@ -4885,6 +4900,7 @@ CONFIG_TI_SCI_PROTOCOL=m
 # CONFIG_TI_SYSCON_RESET is not set
 # CONFIG_TI_TLC4541 is not set
 CONFIG_TLAN=m
+CONFIG_TLS=m
 # CONFIG_TMD_HERMES is not set
 # CONFIG_TMP006 is not set
 # CONFIG_TMP007 is not set
@@ -5586,6 +5602,7 @@ CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_WLAN_VENDOR_RSI=y