Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc4.git1.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc4.git1.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc4.git1.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc4.git1.1.vanilla.knurd.1.fc24

1 files changed, 9 insertions, 26 deletions

diff --git a/kernel-i686.config b/kernel-i686.config
index 8aacfa7f0..6eefaf0af 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -412,7 +412,6 @@ CONFIG_BCMA=m
 # CONFIG_BCM_FLEXRM_MBOX is not set
 CONFIG_BCMGENET=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_BCM_VIDEOCORE is not set
 CONFIG_BE2ISCSI=m
 # CONFIG_BE2NET_HWMON is not set
 CONFIG_BE2NET=m
@@ -699,7 +698,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_BQ24257 is not set
 # CONFIG_CHARGER_BQ24735 is not set
 # CONFIG_CHARGER_BQ25890 is not set
-# CONFIG_CHARGER_CPCAP is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_ISP1704 is not set
@@ -779,7 +777,6 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_CORDIC=m
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CPA_DEBUG is not set
-# CONFIG_CPCAP_ADC is not set
 # CONFIG_CPU5_WDT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPUFREQ_DT is not set
@@ -810,7 +807,7 @@ CONFIG_CRC_CCITT=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_PMIC_OPREGION=y
 CONFIG_CRC_T10DIF=y
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO_842=m
@@ -1130,7 +1127,7 @@ CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
-CONFIG_DRM_MXSFB=m
+# CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NXP_PTN3460 is not set
@@ -1957,10 +1954,6 @@ CONFIG_IIO_BUFFER_CB=m
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_CONFIGFS=m
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-CONFIG_IIO_CROS_EC_LIGHT_PROX=m
-CONFIG_IIO_CROS_EC_SENSORS_CORE=m
-CONFIG_IIO_CROS_EC_SENSORS_COR=m
-CONFIG_IIO_CROS_EC_SENSORS=m
 # CONFIG_IIO_HRTIMER_TRIGGER is not set
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_KFIFO_BUF=m
@@ -2050,7 +2043,6 @@ CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_CMA3000=m
-# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
 # CONFIG_INPUT_DRV260X_HAPTICS is not set
 # CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -2075,7 +2067,7 @@ CONFIG_INPUT_KXTJ9=m
 CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_MATRIXKMAP=m
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_MMA8450=m
+# CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
@@ -2481,7 +2473,7 @@ CONFIG_KEYBOARD_GPIO=m
 # CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
 CONFIG_KEYBOARD_PMIC8XXX=m
-# CONFIG_KEYBOARD_QT1070 is not set
+CONFIG_KEYBOARD_QT1070=m
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_SH_KEYSC is not set
@@ -2558,7 +2550,6 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 CONFIG_LEDS_CLASS_FLASH=m
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLEVO_MAIL=m
-# CONFIG_LEDS_CPCAP is not set
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_INTEL_SS4200=m
@@ -2724,7 +2715,7 @@ CONFIG_MARVELL_PHY=m
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX11100 is not set
 # CONFIG_MAX1118 is not set
-# CONFIG_MAX1363 is not set
+CONFIG_MAX1363=m
 CONFIG_MAX30100=m
 # CONFIG_MAX30102 is not set
 # CONFIG_MAX44000 is not set
@@ -2825,7 +2816,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_AXP20X is not set
 # CONFIG_MFD_BCM590XX is not set
 CONFIG_MFD_CORE=y
-CONFIG_MFD_CPCAP=m
+# CONFIG_MFD_CPCAP is not set
 # CONFIG_MFD_CROS_EC is not set
 CONFIG_MFD_CS5535=m
 # CONFIG_MFD_DA9052_I2C is not set
@@ -2835,7 +2826,6 @@ CONFIG_MFD_CS5535=m
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_EXYNOS_LPASS is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 CONFIG_MFD_INTEL_LPSS_ACPI=m
 CONFIG_MFD_INTEL_LPSS_PCI=m
@@ -3785,10 +3775,8 @@ CONFIG_PCIEASPM=y
 CONFIG_PCIE_DPC=y
 # CONFIG_PCIE_DW_PLAT is not set
 CONFIG_PCIE_ECRC=y
-CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
-CONFIG_PCI_ENDPOINT=y
-# CONFIG_PCI_EPF_TEST is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCI_GOANY=y
@@ -3967,7 +3955,6 @@ CONFIG_PWRSEQ_EMMC=m
 # CONFIG_PWRSEQ_SD8787 is not set
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000 is not set
-CONFIG_QCOM_ADSP_PIL=m
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
@@ -4064,7 +4051,6 @@ CONFIG_REALTEK_AUTOPM=y
 CONFIG_REALTEK_PHY=m
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP=y
-CONFIG_REGULATOR_CPCAP=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
 # CONFIG_REGULATOR_TPS65132 is not set
@@ -4136,7 +4122,6 @@ CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_CPCAP is not set
 CONFIG_RTC_DRV_DS1286=m
 # CONFIG_RTC_DRV_DS1302 is not set
 CONFIG_RTC_DRV_DS1305=m
@@ -4432,7 +4417,7 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADS1015=m
+# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -4712,7 +4697,6 @@ CONFIG_SND_AU8830=m
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
 # CONFIG_SND_BCD2000 is not set
-# CONFIG_SND_BCM28A35 is not set
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
@@ -5220,7 +5204,7 @@ CONFIG_THRUSTMASTER_FF=y
 # CONFIG_TI_ADC12138 is not set
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
-# CONFIG_TI_ADS1015 is not set
+CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
 # CONFIG_TI_ADS8688 is not set
 # CONFIG_TI_CPSW_ALE is not set
@@ -5747,7 +5731,6 @@ CONFIG_VIA_WDT=m
 CONFIG_VIDEO_AU0828=m
 # CONFIG_VIDEO_AU0828_RC is not set
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_BCM2835 is not set
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_VIDEO_CPIA2=m