Linux v4.13-4257-ge7d0c41ecc2e

1 files changed, 18 insertions, 2 deletions

diff --git a/kernel-s390x.config b/kernel-s390x.config
index 2b85deb10..ec4b7294d 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -601,6 +601,7 @@ CONFIG_CASSINI=m
 # CONFIG_CB710_DEBUG is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_CCS811 is not set
 CONFIG_CCW_CONSOLE=y
 CONFIG_CCWGROUP=m
 CONFIG_CCW=y
@@ -688,6 +689,7 @@ CONFIG_CIFS_XATTR=y
 CONFIG_CISS_SCSI_TAPE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CLK_QORIQ is not set
+# CONFIG_CLOCK_THERMAL is not set
 CONFIG_CLS_U32_MARK=y
 CONFIG_CLS_U32_PERF=y
 CONFIG_CM32181=m
@@ -695,7 +697,10 @@ CONFIG_CM32181=m
 # CONFIG_CM3323 is not set
 CONFIG_CM3605=m
 # CONFIG_CM36651 is not set
-# CONFIG_CMA is not set
+CONFIG_CMA_AREAS=7
+# CONFIG_CMA_DEBUGFS is not set
+# CONFIG_CMA_DEBUG is not set
+CONFIG_CMA=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CMM_IUCV=y
 CONFIG_CMM=m
@@ -949,6 +954,7 @@ CONFIG_DEV_APPLETALK=m
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
 # CONFIG_DEVFREQ_GOV_USERSPACE is not set
+# CONFIG_DEVFREQ_THERMAL is not set
 # CONFIG_DEVKMEM is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
@@ -1824,6 +1830,7 @@ CONFIG_INET=y
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 # CONFIG_INFINIBAND_CXGB3 is not set
 # CONFIG_INFINIBAND_CXGB4 is not set
+# CONFIG_INFINIBAND_EXP_USER_ACCESS is not set
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_INFINIBAND_IPOIB_CM=y
 CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
@@ -2432,6 +2439,7 @@ CONFIG_LPFC_NVME_INITIATOR=y
 CONFIG_LPFC_NVME_TARGET=y
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_LSM_MMAP_MIN_ADDR=65536
+# CONFIG_LTC2471 is not set
 # CONFIG_LTC2485 is not set
 # CONFIG_LTC2497 is not set
 # CONFIG_LTC2632 is not set
@@ -3554,12 +3562,15 @@ CONFIG_PHYLIB=m
 # CONFIG_PHY_ST_SPEAR1310_MIPHY is not set
 # CONFIG_PHY_ST_SPEAR1340_MIPHY is not set
 # CONFIG_PHY_TUSB1210 is not set
+# CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
+# CONFIG_PINCTRL_SPRD is not set
+# CONFIG_PINCTRL_SPRD_SC9860 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINMUX is not set
 CONFIG_PKCS7_MESSAGE_PARSER=y
@@ -3576,7 +3587,7 @@ CONFIG_PM_DEBUG=y
 # CONFIG_PM_DEVFREQ is not set
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
-# CONFIG_PM_OPP is not set
+CONFIG_PM_OPP=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_TEST_SUSPEND=y
 CONFIG_PM_TRACE_RTC=y
@@ -3691,6 +3702,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
+# CONFIG_R8822BE is not set
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
@@ -4179,6 +4191,7 @@ CONFIG_SENSORS_HDAPS=m
 # CONFIG_SENSORS_HMC5843_SPI is not set
 # CONFIG_SENSORS_I5K_AMB is not set
 CONFIG_SENSORS_IBMAEM=m
+# CONFIG_SENSORS_IBM_CFFPS is not set
 CONFIG_SENSORS_IBMPEX=m
 # CONFIG_SENSORS_IIO_HWMON is not set
 CONFIG_SENSORS_INA209=m
@@ -4268,6 +4281,7 @@ CONFIG_SENSORS_TMP108=m
 CONFIG_SENSORS_TMP401=m
 CONFIG_SENSORS_TMP421=m
 CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_TPS53679=m
 # CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_SENSORS_TSL2563 is not set
 CONFIG_SENSORS_UCD9000=m
@@ -5528,6 +5542,7 @@ CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
+CONFIG_VMCP_CMA_SIZE=4
 CONFIG_VMCP=y
 # CONFIG_VME_BUS is not set
 CONFIG_VMLOGRDR=m
@@ -5566,6 +5581,7 @@ CONFIG_W1_SLAVE_DS2438=m
 CONFIG_W1_SLAVE_DS2760=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS2805=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_SMEM=m
 CONFIG_W1_SLAVE_THERM=m