From bf681f6a5bde4069ee24290cd4d99fba3e17684c Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 7 Feb 2018 09:13:24 -0600 Subject: Linux v4.15-11704-ga2e5790d8416 --- kernel-s390x-debug.config | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'kernel-s390x-debug.config') diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 827778a79..5534cfb35 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1160,6 +1160,7 @@ CONFIG_DVB_FIREDTV=m CONFIG_DVB_HOPPER=m CONFIG_DVB_MANTIS=m CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_MMAP is not set CONFIG_DVB_MN88472=m CONFIG_DVB_MN88473=m CONFIG_DVB_NETUP_UNIDVB=m @@ -1173,6 +1174,7 @@ CONFIG_DVB_PT1=m CONFIG_DVB_SMIPCIE=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m +# CONFIG_DVB_ULE_DEBUG is not set CONFIG_DVB_USB_A800=m CONFIG_DVB_USB_AF9005=m CONFIG_DVB_USB_AF9005_REMOTE=m @@ -1388,6 +1390,7 @@ CONFIG_FCOE_FNIC=m # CONFIG_FDDI is not set # CONFIG_FEALNX is not set CONFIG_FHANDLE=y +# CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_FIREWIRE is not set CONFIG_FIREWIRE_NET=m # CONFIG_FIREWIRE_NOSY is not set @@ -2454,11 +2457,11 @@ CONFIG_LIBFCOE=m CONFIG_LIQUIDIO_VF=m CONFIG_LIRC_BT829=m CONFIG_LIRC_IMON=m -CONFIG_LIRC=m CONFIG_LIRC_PARALLEL=m CONFIG_LIRC_SERIAL=m CONFIG_LIRC_SERIAL_TRANSMITTER=y CONFIG_LIRC_STAGING=y +CONFIG_LIRC=y CONFIG_LIRC_ZILOG=m # CONFIG_LIVEPATCH is not set # CONFIG_LKDTM is not set @@ -2608,6 +2611,7 @@ CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_MM=m # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_SAS is not set +CONFIG_MELLANOX_PLATFORM=y CONFIG_MEMCG_SWAP_ENABLED=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG=y @@ -2764,6 +2768,7 @@ CONFIG_MLX5_MPFS=y # CONFIG_MLX90614 is not set CONFIG_MLX_CPLD_PLATFORM=m CONFIG_MLXFW=m +CONFIG_MLXREG_HOTPLUG=m CONFIG_MLXSW_CORE_HWMON=y # CONFIG_MLXSW_CORE is not set CONFIG_MLXSW_CORE_THERMAL=y @@ -3581,6 +3586,8 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y +CONFIG_PCIE_CADENCE_EP=y +CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_HOST_ECAM is not set # CONFIG_PCIE_DW_PLAT is not set @@ -4048,6 +4055,7 @@ CONFIG_RTLLIB=m # CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTLWIFI=m # CONFIG_RTS5208 is not set +CONFIG_RUNTIME_TESTING_MENU=y CONFIG_S2IO=m CONFIG_S390_CCW_IOMMU=y CONFIG_S390_GUEST_OLD_TRANSPORT=y -- cgit