Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc23

1 files changed, 28 insertions, 42 deletions

diff --git a/config-generic b/config-generic
index 36600d849..76cbc2635 100644
--- a/config-generic
+++ b/config-generic
@@ -82,8 +82,6 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_KASAN is not set
 
-# CONFIG_AD525X_DPOT is not set
-
 #
 # Loadable module support
 #
@@ -117,10 +115,10 @@ CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
 
+# CONFIG_NTB is not set
 # CONFIG_SGI_IOC4 is not set
 
 # CONFIG_ISA is not set
-# CONFIG_SCx200 is not set
 
 #
 # PCMCIA/CardBus support
@@ -244,6 +242,11 @@ CONFIG_FW_CFG_SYSFS=m
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
 
+# EDAC
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_LEGACY_SYSFS=y
+
 # CONFIG_CMA is not set
 # CONFIG_DMA_CMA is not set
 # CONFIG_FENCE_TRACE is not set
@@ -1858,13 +1861,13 @@ CONFIG_B43=m
 CONFIG_B43_SDIO=y
 CONFIG_B43_BCMA=y
 CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_DEBUG=y
+# CONFIG_B43_DEBUG is not set
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_HT=y
 CONFIG_B43_PHY_G=y
 CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -2007,6 +2010,7 @@ CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_PCIE=m
 CONFIG_MWIFIEX_USB=m
 
+CONFIG_MAC802154=m
 CONFIG_IEEE802154=m
 CONFIG_IEEE802154_SOCKET=m
 CONFIG_IEEE802154_6LOWPAN=m
@@ -2016,11 +2020,10 @@ CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_CC2520=m
 CONFIG_IEEE802154_AT86RF230=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
-# CONFIG_IEEE802154_ADF7242 is not set
-# CONFIG_IEEE802154_MRF24J40 is not set
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_MRF24J40=m
 # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
 
-CONFIG_MAC802154=m
 CONFIG_NET_MPLS_GSO=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS_IPTUNNEL=m
@@ -2638,7 +2641,6 @@ CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
 # CONFIG_DUMMY_IRQ is not set
-# CONFIG_IBM_ASM is not set
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_TCG_TPM=m
@@ -2675,7 +2677,7 @@ CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_INGENIC is not set
 CONFIG_SERIAL_8250_RT288X=y
-CONFIG_SERIAL_8250_MID=y
+# CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
@@ -2773,10 +2775,8 @@ CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 # CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PIIX4 is not set
-# CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
@@ -2797,9 +2797,6 @@ CONFIG_I2C_DIOLAN_U2C=m
 #
 # I2C Hardware Sensors Chip support
 #
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
 CONFIG_SENSORS_ADC128D818=m
@@ -2815,17 +2812,12 @@ CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_DS1621=m
-# CONFIG_DS1682 is not set
 CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
 CONFIG_SENSORS_FTSTEUTATES=m
 CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_G762=m
@@ -2839,9 +2831,6 @@ CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
 # CONFIG_SENSORS_IIO_HWMON is not set
 CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_SENSORS_LIS3_I2C=m
 # CONFIG_SENSORS_LIS3_SPI is not set
 CONFIG_SENSORS_LM63=m
@@ -2885,14 +2874,7 @@ CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_TC74=m
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP401=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29020=m
-CONFIG_ISL29003=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_SENSORS_TSL2550=m
 CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
 CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_VT8231=m
 CONFIG_SENSORS_W83627HF=m
@@ -2950,6 +2932,7 @@ CONFIG_SENSORS_MAX1111=m
 CONFIG_SENSORS_POWR1220=m
 CONFIG_SENSORS_AD7314=m
 
+# PMbus sensors
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_MAX16064=m
@@ -2964,7 +2947,18 @@ CONFIG_SENSORS_MAX197=m
 CONFIG_SENSORS_MAX31790=m
 CONFIG_SENSORS_TPS40422=m
 
-# CONFIG_NTB is not set
+# Misc Sensors
+# CONFIG_AD525X_DPOT is not set
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_SENSORS_TSL2550=m
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_TI_DAC7512 is not set
 
 # Industrial I/O subsystem configuration
 CONFIG_IIO=m
@@ -3128,7 +3122,6 @@ CONFIG_PA12203001=m
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 # CONFIG_HI8435 is not set
-# CONFIG_IMX7D_ADC is not set
 # CONFIG_AM2315 is not set
 # CONFIG_BMI160_I2C is not set
 # CONFIG_BMI160_SPI is not set
@@ -3189,13 +3182,10 @@ CONFIG_PA12203001=m
 # CONFIG_AD2S1200 is not set
 # CONFIG_AD2S1210 is not set
 
+# End sensors
 
-
-# CONFIG_HMC6352 is not set
-# CONFIG_PCH_PHUB is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_SRAM is not set
-# CONFIG_TI_DAC7512 is not set
 # CONFIG_MMA7455_SPI is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 
@@ -3251,7 +3241,6 @@ CONFIG_WDTPCI=m
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_IB700_WDT=m
-# CONFIG_SCx200_WDT is not set
 # CONFIG_60XX_WDT is not set
 CONFIG_W83877F_WDT=m
 CONFIG_W83627HF_WDT=m
@@ -5276,7 +5265,7 @@ CONFIG_PM_DEBUG=y
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 # CONFIG_PM_OPP is not set
 # CONFIG_PM_AUTOSLEEP is not set
 # CONFIG_PM_WAKELOCKS is not set
@@ -5359,7 +5348,6 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X_SPI is not set
-# CONFIG_SND_SOC_QCOM is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 # CONFIG_SND_SOC_TAS5086 is not set
@@ -5885,7 +5873,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_W1_MASTER_GPIO is not set
 # CONFIG_LEDS_GPIO is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_MAX732X is not set
@@ -5912,8 +5900,6 @@ CONFIG_GPIO_VIPERBOARD=m
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_BCM_KONA is not set
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_74X164 is not set