- partial update to 4.1.0 (aufs, imq need fixes)

[packages/kernel.git] / kernel-multiarch.config

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 8690df2819b87ab9da7f3e6353431998d7cc65d5..dd79147857676607bdb3a8ed7d946ef211fe800a 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -16,6 +16,7 @@ KEXEC_VERIFY_SIG all=n
 KVM_DEBUG_FS all=n
 KVM_DEVICE_ASSIGNMENT all=y
 PHYSICAL_ALIGN all=0x1000000
+X86_AMD_PLATFORM_DEVICE all=y
 X86_DEBUG_STATIC_CPU_HAS all=n
 X86_SYSFB all=y
 XEN_PVH all=y
@@ -189,6 +190,7 @@ CRYPTO_DRBG_HASH all=y
 CRYPTO_DRBG_CTR all=y
 CRYPTO_USER_API_HASH all=m
 CRYPTO_USER_API_SKCIPHER all=m
+CRYPTO_USER_API_RNG all=m
 #- file drivers/crypto/Kconfig goes here
 #- file crypto/asymmetric_keys/Kconfig goes here
 
@@ -239,6 +241,7 @@ ACPI_CUSTOM_METHOD all=m
 ACPI_BGRT all=y
 #- file drivers/acpi/apei/Kconfig goes here
 ACPI_EXTLOG all=m
+PMIC_OPREGION all=y
 
 #-
 #- *** FILE: drivers/acpi/apei/Kconfig ***
@@ -250,6 +253,11 @@ ACPI_APEI_MEMORY_FAILURE all=y
 ACPI_APEI_EINJ all=m
 ACPI_APEI_ERST_DEBUG all=m
 
+#-
+#- *** FILE: drivers/android/Kconfig ***
+#-
+ANDROID all=n
+
 #-
 #- *** FILE: drivers/ata/Kconfig ***
 #-
@@ -320,7 +328,6 @@ PATA_PDC_OLD all=m sparc=n
 PATA_RADISYS all=m sparc=n
 PATA_RDC all=m
 PATA_SC1200 all=m sparc=n
-PATA_SCC ppc64=m
 PATA_SCH all=m sparc=n
 PATA_SERVERWORKS all=m sparc=n
 PATA_SIL680 all=m sparc=n
@@ -403,6 +410,8 @@ FIRMWARE_IN_KERNEL all=n
 EXTRA_FIRMWARE all=""
 FW_LOADER_USER_HELPER all=y
 FW_LOADER_USER_HELPER_FALLBACK all=y
+WANT_DEV_COREDUMP all=y
+DEV_COREDUMP all=y
 DEBUG_DRIVER all=n
 DEBUG_DEVRES all=n
 #- file drivers/base/regmap/Kconfig goes here
@@ -416,6 +425,11 @@ CMA_SIZE_SEL_MIN all=n
 CMA_SIZE_SEL_MAX all=n
 CMA_ALIGNMENT all=8
 
+#-
+#- *** FILE: drivers/base/regmap/Kconfig ***
+#-
+REGMAP_SPMI all=m
+
 #-
 #- *** FILE: drivers/bcma/Kconfig ***
 #-
@@ -457,7 +471,8 @@ BLK_DEV_SX8 all=m
 BLK_DEV_RAM all=y
 BLK_DEV_RAM_COUNT all=16
 BLK_DEV_RAM_SIZE all=16384
-BLK_DEV_XIP all=y
+BLK_DEV_RAM_DAX all=y
+BLK_DEV_PMEM all=m
 CDROM_PKTCDVD all=m
 CDROM_PKTCDVD_BUFFERS all=8
 CDROM_PKTCDVD_WCACHE all=y
@@ -521,6 +536,7 @@ ZRAM_DEBUG all=n
 #- *** FILE: drivers/bluetooth/Kconfig ***
 #-
 BT_HCIBTUSB all=m
+BT_HCIBTUSB_BCM all=y
 BT_HCIBTSDIO all=m
 BT_HCIUART all=m
 BT_HCIUART_H4 all=y
@@ -528,6 +544,8 @@ BT_HCIUART_BCSP all=y
 BT_HCIUART_ATH3K all=y
 BT_HCIUART_LL all=y
 BT_HCIUART_3WIRE all=y
+BT_HCIUART_INTEL all=y
+BT_HCIUART_BCM all=y
 BT_HCIBCM203X all=m
 BT_HCIBPA10X all=m
 BT_HCIBFUSB all=m
@@ -550,6 +568,7 @@ OMAP_OCP2SCP all=m
 #- *** FILE: drivers/char/Kconfig ***
 #-
 #- file drivers/tty/Kconfig goes here
+DEVMEM all=y
 DEVKMEM all=y
 SGI_SNSC ia64=y
 SGI_TIOCX ia64=y
@@ -636,6 +655,7 @@ IPMI_PANIC_EVENT all=n
 IPMI_DEVICE_INTERFACE all=m
 IPMI_SI all=m
 IPMI_SI_PROBE_DEFAULTS all=n
+IPMI_SSIF all=m
 IPMI_WATCHDOG all=m
 IPMI_POWEROFF all=m
 
@@ -660,8 +680,16 @@ TCG_TIS_I2C_NUVOTON all=m
 TCG_NSC all=m
 TCG_ATMEL all=m
 TCG_INFINEON all=m
-TCG_ST33_I2C all=m
 TCG_XEN all=m
+TCG_CRB all=m
+#- file drivers/char/tpm/st33zp24/Kconfig goes here
+
+#-
+#- *** FILE: drivers/char/tpm/st33zp24/Kconfig ***
+#-
+TCG_TIS_ST33ZP24 all=m
+TCG_TIS_ST33ZP24_I2C all=m
+TCG_TIS_ST33ZP24_SPI all=m
 
 #-
 #- *** FILE: drivers/char/xillybus/Kconfig ***
@@ -675,6 +703,8 @@ XILLYBUS_PCIE all=m
 COMMON_CLK_WM831X all=m
 #- file drivers/clk/versatile/Kconfig goes here
 COMMON_CLK_SI5351 all=m
+COMMON_CLK_PWM all=m
+COMMON_CLK_CDCE706 all=m
 #- file drivers/clk/qcom/Kconfig goes here
 #- file drivers/clk/bcm/Kconfig goes here
 #- file drivers/clk/mvebu/Kconfig goes here
@@ -701,6 +731,7 @@ CPU_FREQ_GOV_POWERSAVE all=m
 CPU_FREQ_GOV_USERSPACE all=m
 CPU_FREQ_GOV_ONDEMAND all=y
 CPU_FREQ_GOV_CONSERVATIVE all=m
+#- CPU frequency scaling drivers
 #- file drivers/cpufreq/Kconfig.x86 goes here
 #- file drivers/cpufreq/Kconfig.arm goes here
 #- file drivers/cpufreq/Kconfig.powerpc goes here
@@ -719,7 +750,6 @@ CPU_IDLE i386=y sparc64=n x86_64=y
 CPU_IDLE_MULTIPLE_DRIVERS all=y
 CPU_IDLE_GOV_LADDER all=y
 #- file drivers/cpuidle/Kconfig.arm goes here
-#- file drivers/cpuidle/Kconfig.arm64 goes here
 #- file drivers/cpuidle/Kconfig.mips goes here
 #- file drivers/cpuidle/Kconfig.powerpc goes here
 
@@ -740,6 +770,7 @@ CRYPTO_DEV_TALITOS all=m
 CRYPTO_DEV_CCP all=y
 #- file drivers/crypto/ccp/Kconfig goes here
 #- file drivers/crypto/qat/Kconfig goes here
+#- file drivers/crypto/vmx/Kconfig goes here
 
 #-
 #- *** FILE: drivers/crypto/ccp/Kconfig ***
@@ -762,6 +793,12 @@ DEVFREQ_GOV_PERFORMANCE all=y
 DEVFREQ_GOV_POWERSAVE all=y
 DEVFREQ_GOV_USERSPACE all=y
 #- DEVFREQ Drivers
+#- file drivers/devfreq/event/Kconfig goes here
+
+#-
+#- *** FILE: drivers/devfreq/event/Kconfig ***
+#-
+PM_DEVFREQ_EVENT all=y
 
 #-
 #- *** FILE: drivers/dma/Kconfig ***
@@ -770,10 +807,10 @@ DMADEVICES all=y
 DMADEVICES_DEBUG all=n
 #- DMA Devices
 INTEL_MIC_X100_DMA all=m
-INTEL_MID_DMAC all=m
 INTEL_IOATDMA i386=m x86_64=m
 #- file drivers/dma/dw/Kconfig goes here
 FSL_DMA ppc=y ppc64=y
+#- file drivers/dma/hsu/Kconfig goes here
 #- file drivers/dma/bestcomm/Kconfig goes here
 #- file drivers/dma/sh/Kconfig goes here
 TIMB_DMA all=m
@@ -791,6 +828,11 @@ DW_DMAC all=m
 DW_DMAC_PCI all=m
 DW_DMAC_BIG_ENDIAN_IO all=n
 
+#-
+#- *** FILE: drivers/dma/hsu/Kconfig ***
+#-
+HSU_DMA_PCI all=m
+
 #-
 #- *** FILE: drivers/edac/Kconfig ***
 #-
@@ -841,6 +883,7 @@ EXTCON_ARIZONA all=m
 EXTCON_GPIO all=m
 EXTCON_RT8973A all=m
 EXTCON_SM5502 all=m
+EXTCON_USB_GPIO all=m
 
 #-
 #- *** FILE: drivers/firewire/Kconfig ***
@@ -897,53 +940,46 @@ FMC_CHARDEV all=m
 GPIOLIB all=y
 DEBUG_GPIO all=n
 GPIO_SYSFS all=y
-GPIO_DA9052 all=m
-#- Memory mapped GPIO drivers:
-GPIO_GENERIC_PLATFORM all=m
 GPIO_DWAPB all=m
-GPIO_IT8761E all=m
 GPIO_F7188X all=m
+GPIO_GENERIC_PLATFORM all=m
+GPIO_ICH all=m
+GPIO_IT8761E all=m
+GPIO_LYNXPOINT all=y
+GPIO_SCH all=m
 GPIO_SCH311X all=m
 GPIO_TS5500 all=m
-GPIO_XILINX powerpc=y
-GPIO_SCH all=m
-GPIO_ICH all=m
 GPIO_VX855 all=m
-GPIO_LYNXPOINT all=y
-#- I2C GPIO expanders:
-GPIO_ARIZONA all=m
-GPIO_LP3943 all=m
+GPIO_XILINX powerpc=y
+GPIO_ADP5588 all=m
 GPIO_MAX7300 all=m
 GPIO_MAX732X all=m
 GPIO_PCA953X all=m
 GPIO_PCF857X all=m
+GPIO_ARIZONA all=m
+GPIO_CS5535 all=m
+GPIO_DA9052 all=m
+GPIO_DLN2 all=m
+GPIO_JANZ_TTL all=m
+GPIO_KEMPLD all=m
+GPIO_LP3943 all=m
 GPIO_STMPE all=y
+GPIO_TIMBERDALE all=y
 GPIO_TPS65912 all=m
 GPIO_TWL4030 powerpc=m
+GPIO_UCB1400 all=m
 GPIO_WM831X all=m
 GPIO_WM8994 all=m
-GPIO_ADP5588 all=m
-#- PCI GPIO expanders:
-GPIO_CS5535 all=m
-GPIO_BT8XX all=m
 GPIO_AMD8111 all=m
+GPIO_BT8XX all=m
 GPIO_INTEL_MID all=y
-GPIO_PCH all=m
 GPIO_ML_IOH all=m
-GPIO_TIMBERDALE all=y
+GPIO_PCH all=m
 GPIO_RDC321X all=m
-#- SPI GPIO expanders:
+GPIO_74X164 all=m
 GPIO_MAX7301 all=m
 GPIO_MCP23S08 all=m
 GPIO_MC33880 all=m
-GPIO_74X164 all=m
-#- AC97 GPIO expanders:
-GPIO_UCB1400 all=m
-#- LPC GPIO expanders:
-GPIO_KEMPLD all=m
-#- MODULbus GPIO expanders:
-GPIO_JANZ_TTL all=m
-#- USB GPIO expanders:
 GPIO_VIPERBOARD all=m
 
 #-
@@ -964,7 +1000,9 @@ DRM_MGA all=m
 DRM_SIS all=m
 DRM_VIA all=m
 DRM_SAVAGE all=m
+DRM_VGEM all=m
 #- file drivers/gpu/drm/exynos/Kconfig goes here
+#- file drivers/gpu/drm/rockchip/Kconfig goes here
 #- file drivers/gpu/drm/vmwgfx/Kconfig goes here
 #- file drivers/gpu/drm/gma500/Kconfig goes here
 #- file drivers/gpu/drm/udl/Kconfig goes here
@@ -972,6 +1010,7 @@ DRM_SAVAGE all=m
 #- file drivers/gpu/drm/mgag200/Kconfig goes here
 #- file drivers/gpu/drm/cirrus/Kconfig goes here
 #- file drivers/gpu/drm/armada/Kconfig goes here
+#- file drivers/gpu/drm/atmel-hlcdc/Kconfig goes here
 #- file drivers/gpu/drm/rcar-du/Kconfig goes here
 #- file drivers/gpu/drm/shmobile/Kconfig goes here
 #- file drivers/gpu/drm/omapdrm/Kconfig goes here
@@ -982,6 +1021,13 @@ DRM_SAVAGE all=m
 #- file drivers/gpu/drm/tegra/Kconfig goes here
 #- file drivers/gpu/drm/panel/Kconfig goes here
 #- file drivers/gpu/drm/sti/Kconfig goes here
+#- file drivers/gpu/drm/amd/amdkfd/Kconfig goes here
+#- file drivers/gpu/drm/imx/Kconfig goes here
+
+#-
+#- *** FILE: drivers/gpu/drm/amd/amdkfd/Kconfig ***
+#-
+HSA_AMD all=m
 
 #-
 #- *** FILE: drivers/gpu/drm/ast/Kconfig ***
@@ -1013,6 +1059,7 @@ DRM_GMA3600 all=y
 #-
 #- *** FILE: drivers/gpu/drm/i2c/Kconfig ***
 #-
+DRM_I2C_ADV7511 all=m
 DRM_I2C_CH7006 all=m
 DRM_I2C_SIL164 all=m
 DRM_I2C_NXP_TDA998X all=m
@@ -1046,6 +1093,7 @@ DRM_QXL all=m
 #-
 #- *** FILE: drivers/gpu/drm/radeon/Kconfig ***
 #-
+DRM_RADEON_USERPTR all=y
 DRM_RADEON_UMS all=n
 
 #-
@@ -1070,6 +1118,7 @@ VGA_SWITCHEROO all=y
 #- *** FILE: drivers/hid/Kconfig ***
 #-
 HID all=m
+HID_BATTERY_STRENGTH all=y
 HIDRAW all=y
 UHID all=m
 HID_GENERIC all=m
@@ -1080,6 +1129,7 @@ HID_APPLE all=m
 HID_APPLEIR all=m
 HID_AUREAL all=m
 HID_BELKIN all=m
+HID_BETOP_FF all=m
 HID_CHERRY all=m
 HID_CHICONY all=m
 HID_PRODIKEYS all=m
@@ -1094,7 +1144,6 @@ HID_EZKEY all=m
 HID_HOLTEK all=m
 HOLTEK_FF all=y
 HID_GT683R all=m
-HID_HUION all=m
 HID_KEYTOUCH all=m
 HID_KYE all=m
 HID_UCLOGIC all=m
@@ -1107,6 +1156,7 @@ HID_LCPOWER all=m
 HID_LENOVO all=m
 HID_LOGITECH all=m
 HID_LOGITECH_DJ all=m
+HID_LOGITECH_HIDPP all=m
 LOGITECH_FF all=y
 LOGIRUMBLEPAD2_FF all=y
 LOGIG940_FF all=y
@@ -1126,6 +1176,7 @@ HID_PICOLCD_FB all=y
 HID_PICOLCD_BACKLIGHT all=y
 HID_PICOLCD_LCD all=y
 HID_PICOLCD_LEDS all=y
+HID_PLANTRONICS all=m
 HID_PRIMAX all=m
 HID_ROCCAT all=m
 HID_SAITEK all=m
@@ -1153,6 +1204,7 @@ HID_ZEROPLUS all=m
 ZEROPLUS_FF all=y
 HID_ZYDACRON all=m
 HID_SENSOR_HUB all=m
+HID_SENSOR_CUSTOM_SENSOR all=m
 #- file drivers/hid/usbhid/Kconfig goes here
 #- file drivers/hid/i2c-hid/Kconfig goes here
 
@@ -1240,6 +1292,7 @@ SENSORS_HIH6130 all=m
 SENSORS_IBMAEM all=m
 SENSORS_IBMPEX all=m
 SENSORS_IIO_HWMON all=m
+SENSORS_I5500 all=m
 SENSORS_CORETEMP all=m
 SENSORS_IT87 all=m
 SENSORS_JC42 all=m
@@ -1286,6 +1339,8 @@ SENSORS_PC87427 all=m
 SENSORS_NTC_THERMISTOR all=m
 SENSORS_NCT6683 all=m
 SENSORS_NCT6775 all=m
+SENSORS_NCT7802 all=m
+SENSORS_NCT7904 all=m
 SENSORS_PCF8591 all=m
 #- file drivers/hwmon/pmbus/Kconfig goes here
 SENSORS_SHT15 all=m
@@ -1343,6 +1398,7 @@ SENSORS_PMBUS all=m
 SENSORS_ADM1275 all=m
 SENSORS_LM25066 all=m
 SENSORS_LTC2978 all=m
+SENSORS_LTC2978_REGULATOR all=y
 SENSORS_MAX16064 all=m
 SENSORS_MAX34440 all=m
 SENSORS_MAX8688 all=m
@@ -1364,6 +1420,8 @@ I2C_HELPER_AUTO all=y
 #- file drivers/i2c/algos/Kconfig goes here
 #- file drivers/i2c/busses/Kconfig goes here
 I2C_STUB all=m
+I2C_SLAVE all=y
+I2C_SLAVE_EEPROM all=m
 I2C_DEBUG_CORE all=n
 I2C_DEBUG_ALGO all=n
 I2C_DEBUG_BUS all=n
@@ -1418,6 +1476,7 @@ I2C_SIMTEC all=m sparc=n
 I2C_XILINX all=m
 #- External I2C/SMBus adapter drivers
 I2C_DIOLAN_U2C all=m
+I2C_DLN2 all=m
 I2C_PARPORT all=m
 I2C_PARPORT_LIGHT all=m
 I2C_ROBOTFUZZ_OSIF all=m
@@ -1499,7 +1558,6 @@ BLK_DEV_SLC90E66 all=m
 BLK_DEV_TRM290 all=m
 BLK_DEV_VIA82CXXX all=m
 BLK_DEV_TC86C001 all=m
-BLK_DEV_CELLEB ppc64=m
 #* BLK_DEV_IDE_PMAC could be 'm' but it fails to build with PMAC_MEDIABAY=y
 BLK_DEV_IDE_PMAC ppc=y ppc64=y
 BLK_DEV_IDE_PMAC_ATA100FIRST ppc=y ppc64=y
@@ -1553,6 +1611,8 @@ IIO_ST_ACCEL_3AXIS all=m
 KXSD9 all=m
 MMA8452 all=m
 KXCJK1013 all=m
+MMA9551 all=m
+MMA9553 all=m
 
 #-
 #- *** FILE: drivers/iio/adc/Kconfig ***
@@ -1566,12 +1626,15 @@ AD7793 all=m
 AD7887 all=m
 AD7923 all=m
 AD799X all=m
+CC10001_ADC all=m
 MAX1027 all=m
 MAX1363 all=m
 MCP320X all=m
 MCP3422 all=m
 MEN_Z188_ADC all=m
 NAU7802 all=m
+QCOM_SPMI_IADC all=m
+QCOM_SPMI_VADC all=m
 TI_ADC081C all=m
 TI_ADC128S052 all=m
 TI_AM335X_ADC all=m
@@ -1582,6 +1645,12 @@ VIPERBOARD_ADC all=m
 #-
 AD8366 all=m
 
+#-
+#- *** FILE: drivers/iio/common/ssp_sensors/Kconfig ***
+#-
+IIO_SSP_SENSORS_COMMONS all=m
+IIO_SSP_SENSORHUB all=m
+
 #-
 #- *** FILE: drivers/iio/dac/Kconfig ***
 #-
@@ -1626,12 +1695,14 @@ ITG3200 all=m
 #-
 DHT11 all=m
 SI7005 all=m
+SI7020 all=m
 
 #-
 #- *** FILE: drivers/iio/imu/Kconfig ***
 #-
 ADIS16400 all=m
 ADIS16480 all=m
+KMX61 all=m
 #- file drivers/iio/imu/inv_mpu6050/Kconfig goes here
 
 #-
@@ -1646,11 +1717,14 @@ ADJD_S311 all=m
 AL3320A all=m
 APDS9300 all=m
 CM32181 all=m
+CM3232 all=m
+CM3323 all=m
 CM36651 all=m
 GP2AP020A00F all=m
 ISL29125 all=m
 HID_SENSOR_ALS all=m
 HID_SENSOR_PROX all=m
+JSA1212 all=m
 SENSORS_LM3533 all=m
 LTR501 all=m
 TCS3414 all=m
@@ -1677,9 +1751,13 @@ HID_SENSOR_DEVICE_ROTATION all=m
 #-
 #- *** FILE: drivers/iio/pressure/Kconfig ***
 #-
+BMP280 all=m
 HID_SENSOR_PRESS all=m
 MPL115 all=m
 MPL3115 all=m
+MS5611 all=m
+MS5611_I2C all=m
+MS5611_SPI all=m
 IIO_ST_PRESS all=m
 T5403 all=m
 
@@ -1687,6 +1765,7 @@ T5403 all=m
 #- *** FILE: drivers/iio/proximity/Kconfig ***
 #-
 AS3935 all=m
+SX9500 all=m
 
 #-
 #- *** FILE: drivers/iio/temperature/Kconfig ***
@@ -1707,6 +1786,7 @@ INFINIBAND all=m sparc=n
 INFINIBAND_USER_MAD all=m sparc=
 INFINIBAND_USER_ACCESS all=m sparc=
 INFINIBAND_USER_MEM all=y sparc=
+INFINIBAND_ON_DEMAND_PAGING all=y
 INFINIBAND_ADDR_TRANS all=y sparc=
 #- file drivers/infiniband/hw/mthca/Kconfig goes here
 #- file drivers/infiniband/hw/ipath/Kconfig goes here
@@ -1929,6 +2009,7 @@ INPUT_AD714X_I2C all=m
 INPUT_AD714X_SPI all=m
 INPUT_ARIZONA_HAPTICS all=m
 INPUT_BMA150 all=m
+INPUT_E3X0_BUTTON all=m
 INPUT_PCSPKR all=m
 INPUT_SPARCSPKR sparc64=m
 INPUT_MC13783_PWRBUTTON all=m
@@ -1947,7 +2028,9 @@ INPUT_KXTJ9_POLLED_MODE all=y
 INPUT_POWERMATE all=m sparc=n
 INPUT_YEALINK all=m sparc=n
 INPUT_CM109 all=m
+INPUT_REGULATOR_HAPTIC all=m
 INPUT_RETU_PWRBUTTON all=m
+INPUT_TPS65218_PWRBUTTON all=m
 INPUT_TWL4030_PWRBUTTON powerpc=m
 INPUT_UINPUT all=m sparc=n
 INPUT_PCF50633_PMU all=m
@@ -1982,10 +2065,14 @@ MOUSE_PS2_TRACKPOINT all=y
 MOUSE_PS2_ELANTECH all=y
 MOUSE_PS2_SENTELIC all=y
 MOUSE_PS2_TOUCHKIT all=y sparc=n
+MOUSE_PS2_VMMOUSE all=y
 MOUSE_SERIAL all=m
 MOUSE_APPLETOUCH all=m sparc=n
 MOUSE_BCM5974 all=m
 MOUSE_CYAPA all=m
+MOUSE_ELAN_I2C all=m
+MOUSE_ELAN_I2C_I2C all=y
+MOUSE_ELAN_I2C_SMBUS all=y
 MOUSE_INPORT alpha=m i386=m
 MOUSE_ATIXL alpha=y i386=y
 MOUSE_LOGIBM alpha=m i386=m
@@ -2049,8 +2136,10 @@ TOUCHSCREEN_HAMPSHIRE all=m
 TOUCHSCREEN_EETI all=m
 TOUCHSCREEN_EGALAX all=m
 TOUCHSCREEN_FUJITSU all=m
+TOUCHSCREEN_GOODIX all=m
 TOUCHSCREEN_ILI210X all=m
 TOUCHSCREEN_GUNZE all=m
+TOUCHSCREEN_ELAN all=m
 TOUCHSCREEN_ELO all=m
 TOUCHSCREEN_WACOM_W8001 all=m
 TOUCHSCREEN_WACOM_I2C all=m
@@ -2101,6 +2190,7 @@ TOUCHSCREEN_PCAP all=m
 TOUCHSCREEN_ST1232 all=m
 TOUCHSCREEN_STMPE all=m
 TOUCHSCREEN_SUR40 all=m
+TOUCHSCREEN_SX8654 all=m
 TOUCHSCREEN_TPS6507X all=m
 TOUCHSCREEN_ZFORCE all=m
 
@@ -2268,6 +2358,7 @@ ISDN_DRV_SC all=m
 NEW_LEDS all=y
 #* ADB_PMU_LED forces it to 'y'
 LEDS_CLASS all=y
+LEDS_CLASS_FLASH all=m
 #- LED drivers
 LEDS_LM3530 all=m
 LEDS_LM3533 all=m
@@ -2283,6 +2374,7 @@ LEDS_LP5521 all=m
 LEDS_LP5523 all=m
 LEDS_LP5562 all=m
 LEDS_LP8501 all=m
+LEDS_LP8860 all=m
 LEDS_CLEVO_MAIL all=m
 LEDS_PCA955X all=m
 LEDS_PCA963X all=m
@@ -2304,6 +2396,7 @@ LEDS_OT200 all=m
 LEDS_MENF21BMC all=m
 #- LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 LEDS_BLINKM all=m
+LEDS_PM8941_WLED all=m
 #- LED Triggers
 #- file drivers/leds/trigger/Kconfig goes here
 
@@ -2347,7 +2440,6 @@ INPUT_ADBHID ppc=y
 MAC_EMUMOUSEBTN all=y
 THERM_WINDTUNNEL ppc=m
 THERM_ADT746X ppc=m
-THERM_PM72 ppc64=n
 WINDFARM ppc=m ppc64=n
 ANSLCD ppc=m
 PMAC_RACKMETER ppc=m ppc64=m
@@ -2359,6 +2451,8 @@ SENSORS_AMS_I2C ppc=y
 #- *** FILE: drivers/mailbox/Kconfig ***
 #-
 MAILBOX all=y
+PCC all=y
+ALTERA_MBOX all=m
 
 #-
 #- *** FILE: drivers/mcb/Kconfig ***
@@ -2378,8 +2472,10 @@ MD_RAID10 all=m
 MD_RAID456 all=m
 MD_MULTIPATH all=m
 MD_FAULTY all=m
+MD_CLUSTER all=m
 #- file drivers/md/bcache/Kconfig goes here
 BLK_DEV_DM all=m
+DM_MQ_DEFAULT all=y
 DM_DEBUG all=n
 #- file drivers/md/persistent-data/Kconfig goes here
 DM_CRYPT all=m
@@ -2401,6 +2497,7 @@ DM_UEVENT all=y
 DM_FLAKEY all=m
 DM_VERITY all=m
 DM_SWITCH all=m
+DM_LOG_WRITES all=m
 
 #-
 #- *** FILE: drivers/md/bcache/Kconfig ***
@@ -2438,7 +2535,6 @@ DVB_NET all=y
 #- file drivers/media/pci/Kconfig goes here
 #- file drivers/media/platform/Kconfig goes here
 #- file drivers/media/mmc/Kconfig goes here
-#- file drivers/media/parport/Kconfig goes here
 #- file drivers/media/radio/Kconfig goes here
 #- Supported FireWire (IEEE 1394) Adapters
 #- file drivers/media/firewire/Kconfig goes here
@@ -2455,7 +2551,6 @@ MEDIA_ATTACH all=y
 #-
 #- common driver options
 VIDEO_CX2341X all=m
-VIDEO_BTCX all=m sparc=
 VIDEO_TVEEPROM all=m
 #- file drivers/media/common/b2c2/Kconfig goes here
 #- file drivers/media/common/saa7146/Kconfig goes here
@@ -2537,6 +2632,7 @@ DVB_AU8522 all=m
 DVB_S5H1411 all=m
 #- ISDB-T (terrestrial) frontends
 DVB_S921 all=m
+#- ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #- Digital terrestrial only tuners/PLL
 DVB_PLL all=m
 DVB_TUNER_DIB0070 all=m
@@ -2545,6 +2641,7 @@ DVB_TUNER_DIB0070 all=m
 DVB_LNBP21 all=m
 DVB_ISL6405 all=m
 DVB_ISL6421 all=m
+DVB_SP2 all=m
 DVB_LGS8GL5 all=m
 #- Tools to develop new frontends
 
@@ -2632,15 +2729,6 @@ SOC_CAMERA_TW9910 all=m
 #-
 SMS_SDIO_DRV all=m
 
-#-
-#- *** FILE: drivers/media/parport/Kconfig ***
-#-
-MEDIA_PARPORT_SUPPORT all=y
-VIDEO_BWQCAM all=m
-VIDEO_CQCAM all=m
-VIDEO_PMS all=m
-VIDEO_W9966 all=m
-
 #-
 #- *** FILE: drivers/media/pci/Kconfig ***
 #-
@@ -2672,6 +2760,7 @@ MEDIA_PCI_SUPPORT all=y
 #- file drivers/media/pci/mantis/Kconfig goes here
 #- file drivers/media/pci/ngene/Kconfig goes here
 #- file drivers/media/pci/ddbridge/Kconfig goes here
+#- file drivers/media/pci/smipcie/Kconfig goes here
 
 #-
 #- *** FILE: drivers/media/pci/b2c2/Kconfig ***
@@ -2783,6 +2872,11 @@ VIDEO_MXB all=m sparc=n
 #-
 VIDEO_SAA7164 all=m
 
+#-
+#- *** FILE: drivers/media/pci/smipcie/Kconfig ***
+#-
+DVB_SMIPCIE all=m
+
 #-
 #- *** FILE: drivers/media/pci/solo6x10/Kconfig ***
 #-
@@ -2829,13 +2923,14 @@ VIDEO_TIMBERDALE all=m
 #- file drivers/media/platform/soc_camera/Kconfig goes here
 #- file drivers/media/platform/exynos4-is/Kconfig goes here
 #- file drivers/media/platform/s5p-tv/Kconfig goes here
+#- file drivers/media/platform/am437x/Kconfig goes here
+#- file drivers/media/platform/xilinx/Kconfig goes here
 V4L_MEM2MEM_DRIVERS all=y
 VIDEO_MEM2MEM_DEINTERLACE all=m
 VIDEO_SH_VEU all=m
 VIDEO_RENESAS_VSP1 all=m
 V4L_TEST_DRIVERS all=n
 #- file drivers/media/platform/vivid/Kconfig goes here
-VIDEO_MEM2MEM_TESTDEV all=m
 
 #-
 #- *** FILE: drivers/media/platform/marvell-ccic/Kconfig ***
@@ -2934,6 +3029,7 @@ IR_NUVOTON all=m
 IR_REDRAT3 all=m
 IR_STREAMZAP all=m
 IR_WINBOND_CIR all=m
+IR_IGORPLUGUSB all=m
 IR_IGUANA all=m
 IR_TTUSBIR all=m
 #- file drivers/media/rc/img-ir/Kconfig goes here
@@ -2961,6 +3057,7 @@ RC_MAP all=m
 #- *** FILE: drivers/media/tuners/Kconfig ***
 #-
 MEDIA_TUNER_TDA18212 all=m
+MEDIA_TUNER_M88RS6000T all=m
 
 #-
 #- *** FILE: drivers/media/usb/Kconfig ***
@@ -2978,7 +3075,6 @@ MEDIA_USB_SUPPORT all=y
 #- Analog TV USB devices
 #- file drivers/media/usb/pvrusb2/Kconfig goes here
 #- file drivers/media/usb/hdpvr/Kconfig goes here
-#- file drivers/media/usb/tlg2300/Kconfig goes here
 #- file drivers/media/usb/usbvision/Kconfig goes here
 #- file drivers/media/usb/stk1160/Kconfig goes here
 #- file drivers/media/usb/go7007/Kconfig goes here
@@ -3149,6 +3245,7 @@ USB_GSPCA_STV0680 all=m
 USB_GSPCA_SUNPLUS all=m
 USB_GSPCA_T613 all=m
 USB_GSPCA_TOPRO all=m
+USB_GSPCA_TOUPTEK all=m
 USB_GSPCA_TV8532 all=m
 USB_GSPCA_VC032X all=m
 USB_GSPCA_VICAM all=m
@@ -3222,11 +3319,6 @@ VIDEO_STK1160 all=m
 #-
 USB_STKWEBCAM all=m
 
-#-
-#- *** FILE: drivers/media/usb/tlg2300/Kconfig ***
-#-
-VIDEO_TLG2300 all=m
-
 #-
 #- *** FILE: drivers/media/usb/tm6000/Kconfig ***
 #-
@@ -3280,6 +3372,7 @@ VIDEOBUF2_VMALLOC all=m
 #- *** FILE: drivers/memory/Kconfig ***
 #-
 MEMORY all=y
+#- file drivers/memory/tegra/Kconfig goes here
 
 #-
 #- *** FILE: drivers/memstick/Kconfig ***
@@ -3319,20 +3412,6 @@ FUSION_CTL all=m sparc=n
 FUSION_LAN all=m sparc=n
 FUSION_LOGGING all=y sparc=n
 
-#-
-#- *** FILE: drivers/message/i2o/Kconfig ***
-#-
-I2O all=m sparc=n
-I2O_LCT_NOTIFY_ON_CHANGES all=y
-I2O_EXT_ADAPTEC all=y
-I2O_EXT_ADAPTEC_DMA64 all=y
-I2O_CONFIG all=m sparc64=n
-I2O_CONFIG_OLD_IOCTL all=y x86_64=n
-I2O_BUS all=m
-I2O_BLOCK all=m
-I2O_SCSI all=m
-I2O_PROC all=m
-
 #-
 #- *** FILE: drivers/mfd/Kconfig ***
 #-
@@ -3343,14 +3422,17 @@ MFD_CROS_EC_I2C all=m
 MFD_CROS_EC_SPI all=m
 PMIC_DA903X powerpc=y
 MFD_DA9052_SPI all=y
+MFD_DLN2 all=m
 MFD_MC13XXX all=m
 MFD_MC13XXX_SPI all=m
 MFD_MC13XXX_I2C all=m
 HTC_PASIC3 all=m
+MFD_INTEL_QUARK_I2C_GPIO all=m
 LPC_ICH all=m
 LPC_SCH all=m
 MFD_JANZ_CMODIO all=m
 MFD_KEMPLD all=m
+MFD_MT6397 all=m
 MFD_MENF21BMC all=m
 EZX_PCAP all=y
 MFD_VIPERBOARD all=m
@@ -3366,6 +3448,7 @@ MFD_RN5T618 all=m
 MFD_SI476X_CORE all=m
 MFD_SM501 all=m
 MFD_SM501_GPIO all=y
+MFD_SKY81452 all=m
 ABX500_CORE all=y
 AB3100_CORE all=y
 AB3100_OTP all=m
@@ -3570,6 +3653,7 @@ MMC_USHC all=m
 MMC_USDHI6ROL0 all=m
 MMC_REALTEK_PCI all=m
 MMC_REALTEK_USB all=m
+MMC_TOSHIBA_PCI all=m
 
 #-
 #- *** FILE: drivers/mtd/Kconfig ***
@@ -3596,6 +3680,7 @@ SSFDC all=m
 SM_FTL all=m
 MTD_OOPS all=m
 MTD_SWAP all=m
+MTD_PARTITIONED_MASTER all=y
 #- file drivers/mtd/chips/Kconfig goes here
 #- file drivers/mtd/maps/Kconfig goes here
 #- file drivers/mtd/devices/Kconfig goes here
@@ -3716,6 +3801,7 @@ MTD_NAND_PASEMI ppc64=m
 MTD_NAND_NANDSIM all=m ppc=n ppc64=n sparc=n
 MTD_NAND_PLATFORM all=m sparc=n
 MTD_NAND_FSL_ELBC ppc=m ppc64=m
+MTD_NAND_HISI504 all=m
 
 #-
 #- *** FILE: drivers/mtd/onenand/Kconfig ***
@@ -3756,6 +3842,7 @@ IFB all=m
 #- file drivers/net/team/Kconfig goes here
 MACVLAN all=m
 MACVTAP all=m
+IPVLAN all=m
 VXLAN all=m
 NETCONSOLE all=m
 NETCONSOLE_DYNAMIC all=y
@@ -3911,6 +3998,7 @@ NET_DSA_MV88E6060 all=y
 NET_DSA_MV88E6131 all=y
 NET_DSA_MV88E6123_61_65 all=y
 NET_DSA_MV88E6171 all=m
+NET_DSA_MV88E6352 all=m
 NET_DSA_BCM_SF2 all=m
 
 #-
@@ -3998,6 +4086,7 @@ ETHOC all=m
 #- file drivers/net/ethernet/realtek/Kconfig goes here
 #- file drivers/net/ethernet/renesas/Kconfig goes here
 #- file drivers/net/ethernet/rdc/Kconfig goes here
+#- file drivers/net/ethernet/rocker/Kconfig goes here
 #- file drivers/net/ethernet/samsung/Kconfig goes here
 #- file drivers/net/ethernet/seeq/Kconfig goes here
 #- file drivers/net/ethernet/silan/Kconfig goes here
@@ -4051,6 +4140,8 @@ PCNET32 all=m
 PCMCIA_NMCLAN all=m
 NI65 alpha=m i386=m
 SUNLANCE sparc=m sparc64=m
+AMD_XGBE all=m
+AMD_XGBE_DCB all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/apm/xgene/Kconfig ***
@@ -4083,6 +4174,7 @@ ALX all=m
 #- *** FILE: drivers/net/ethernet/broadcom/Kconfig ***
 #-
 B44 all=m
+BCMGENET all=m
 BNX2 all=m
 CNIC all=m
 TIGON3 all=m
@@ -4104,7 +4196,6 @@ BNA all=m
 #- *** FILE: drivers/net/ethernet/cadence/Kconfig ***
 #-
 NET_CADENCE all=y
-ARM_AT91_ETHER all=m
 MACB all=m
 
 #-
@@ -4120,6 +4211,7 @@ CHELSIO_T1_1G all=y
 CHELSIO_T3 all=m
 CHELSIO_T4 all=m
 CHELSIO_T4_DCB all=y
+CHELSIO_T4_FCOE all=y
 CHELSIO_T4VF all=m
 
 #-
@@ -4230,6 +4322,7 @@ IGB_DCA all=y
 IGBVF all=m
 IXGB all=m sparc=n
 IXGBE all=m
+IXGBE_VXLAN all=y
 IXGBE_HWMON all=y
 IXGBE_DCA all=y
 IXGBE_DCB all=y
@@ -4237,6 +4330,7 @@ IXGBEVF all=m
 I40E all=m
 I40E_VXLAN all=y
 I40E_DCB all=y
+I40E_FCOE all=y
 I40EVF all=m
 FM10K all=m
 FM10K_VXLAN all=y
@@ -4370,6 +4464,12 @@ R8169 all=m sparc=n
 #-
 SH_ETH all=m
 
+#-
+#- *** FILE: drivers/net/ethernet/rocker/Kconfig ***
+#-
+NET_VENDOR_ROCKER all=y
+ROCKER all=m
+
 #-
 #- *** FILE: drivers/net/ethernet/samsung/Kconfig ***
 #-
@@ -4424,8 +4524,6 @@ NET_VENDOR_STMICRO all=y
 STMMAC_ETH all=m
 STMMAC_PLATFORM all=n
 STMMAC_PCI all=n
-STMMAC_DEBUG_FS all=y
-STMMAC_DA all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/sun/Kconfig ***
@@ -4449,6 +4547,7 @@ TEHUTI all=m
 #- *** FILE: drivers/net/ethernet/ti/Kconfig ***
 #-
 NET_VENDOR_TI all=y
+TI_CPSW_ALE all=m
 TLAN all=m sparc=n
 
 #-
@@ -4527,7 +4626,6 @@ HYPERV_NET all=m
 #- *** FILE: drivers/net/ieee802154/Kconfig ***
 #-
 IEEE802154_DRIVERS all=m
-IEEE802154_FAKEHARD all=m
 IEEE802154_FAKELB all=m
 IEEE802154_AT86RF230 all=m
 IEEE802154_MRF24J40 all=m
@@ -4572,6 +4670,7 @@ PHYLIB all=y
 #- MII PHY device drivers
 AT803X_PHY all=m
 AMD_PHY all=m
+AMD_XGBE_PHY all=m
 MARVELL_PHY all=m
 DAVICOM_PHY all=m
 QSEMI_PHY all=m
@@ -4817,6 +4916,7 @@ ATH9K_DEBUGFS all=n
 ATH9K_DYNACK all=y
 ATH9K_WOW all=y
 ATH9K_CHANNEL_CONTEXT all=y
+ATH9K_PCOEM all=y
 ATH9K_HTC all=m
 ATH9K_HTC_DEBUGFS all=y
 
@@ -5078,6 +5178,7 @@ NFC_PORT100 all=m
 #- file drivers/nfc/nfcmrvl/Kconfig goes here
 #- file drivers/nfc/st21nfca/Kconfig goes here
 #- file drivers/nfc/st21nfcb/Kconfig goes here
+#- file drivers/nfc/nxp-nci/Kconfig goes here
 
 #-
 #- *** FILE: drivers/nfc/microread/Kconfig ***
@@ -5092,6 +5193,12 @@ NFC_MICROREAD_MEI all=m
 NFC_MRVL all=m
 NFC_MRVL_USB all=m
 
+#-
+#- *** FILE: drivers/nfc/nxp-nci/Kconfig ***
+#-
+NFC_NXP_NCI all=m
+NFC_NXP_NCI_I2C all=m
+
 #-
 #- *** FILE: drivers/nfc/pn544/Kconfig ***
 #-
@@ -5152,7 +5259,6 @@ HT_IRQ i386=y x86_64=y
 PCI_IOV all=y
 PCI_PRI all=y
 PCI_PASID all=y
-PCI_IOAPIC all=y
 PCI_LABEL all=y
 #- file drivers/pci/host/Kconfig goes here
 
@@ -5234,10 +5340,13 @@ PHY_SAMSUNG_USB2 all=m
 #-
 PINMUX all=y
 PINCONF all=y
+GENERIC_PINCONF all=y
 DEBUG_PINCTRL all=n
-PINCTRL_BAYTRAIL all=y
+PINCTRL_AMD all=y
+#- file drivers/pinctrl/bcm/Kconfig goes here
 #- file drivers/pinctrl/berlin/Kconfig goes here
 #- file drivers/pinctrl/freescale/Kconfig goes here
+#- file drivers/pinctrl/intel/Kconfig goes here
 #- file drivers/pinctrl/mvebu/Kconfig goes here
 #- file drivers/pinctrl/nomadik/Kconfig goes here
 #- file drivers/pinctrl/qcom/Kconfig goes here
@@ -5246,6 +5355,14 @@ PINCTRL_BAYTRAIL all=y
 #- file drivers/pinctrl/spear/Kconfig goes here
 #- file drivers/pinctrl/sunxi/Kconfig goes here
 #- file drivers/pinctrl/vt8500/Kconfig goes here
+#- file drivers/pinctrl/mediatek/Kconfig goes here
+
+#-
+#- *** FILE: drivers/pinctrl/intel/Kconfig ***
+#-
+PINCTRL_BAYTRAIL all=y
+PINCTRL_CHERRYVIEW all=m
+PINCTRL_SUNRISEPOINT all=m
 
 #-
 #- *** FILE: drivers/platform/chrome/Kconfig ***
@@ -5253,6 +5370,8 @@ PINCTRL_BAYTRAIL all=y
 CHROME_PLATFORMS all=y
 CHROMEOS_LAPTOP all=m
 CHROMEOS_PSTORE all=m
+CROS_EC_CHARDEV all=m
+CROS_EC_LPC all=m
 
 #-
 #- *** FILE: drivers/platform/x86/Kconfig ***
@@ -5377,6 +5496,7 @@ CHARGER_BQ2415X all=m
 CHARGER_BQ24190 all=m
 CHARGER_BQ24735 all=m
 CHARGER_SMB347 all=m
+BATTERY_GAUGE_LTC2941 all=m
 AB8500_BM all=n
 BATTERY_GOLDFISH all=m
 #- file drivers/power/reset/Kconfig goes here
@@ -5391,6 +5511,7 @@ POWER_AVS all=y
 #- *** FILE: drivers/power/reset/Kconfig ***
 #-
 POWER_RESET all=y
+POWER_RESET_RESTART all=n
 
 #-
 #- *** FILE: drivers/powercap/Kconfig ***
@@ -5490,11 +5611,13 @@ REGULATOR_MAX8952 all=m
 REGULATOR_MAX8973 all=m
 REGULATOR_MC13783 all=m
 REGULATOR_MC13892 all=m
+REGULATOR_MT6397 all=m
 REGULATOR_PCAP all=m
 REGULATOR_PCF50633 all=m
 REGULATOR_PFUZE100 all=m
 REGULATOR_PWM all=m
 REGULATOR_RN5T618 all=m
+REGULATOR_SKY81452 all=m
 REGULATOR_TPS51632 all=m
 REGULATOR_TPS6105X all=m
 REGULATOR_TPS62360 all=m
@@ -5537,8 +5660,11 @@ RTC_INTF_DEV all=y
 RTC_INTF_DEV_UIE_EMUL all=n
 RTC_DRV_TEST all=m
 #- I2C RTC drivers
+RTC_DRV_ABB5ZES3 all=m
+RTC_DRV_ABX80X all=m
 RTC_DRV_DS1307 all=m
 RTC_DRV_DS1374 all=m
+RTC_DRV_DS1374_WDT all=y
 RTC_DRV_DS1672 all=m
 RTC_DRV_DS3232 all=m
 RTC_DRV_MAX6900 all=m sparc=n
@@ -5581,6 +5707,14 @@ RTC_DRV_CMOS all=y
 RTC_DRV_DS1286 all=m
 RTC_DRV_DS1511 all=m
 RTC_DRV_DS1553 all=m
+RTC_DRV_DS1685_FAMILY all=m
+RTC_DRV_DS1685 all=y
+RTC_DRV_DS1689 all=n
+RTC_DRV_DS17285 all=n
+RTC_DRV_DS17485 all=n
+RTC_DRV_DS17885 all=n
+RTC_DS1685_PROC_REGS all=n
+RTC_DS1685_SYSFS_REGS all=y
 RTC_DRV_DS1742 all=m
 RTC_DRV_DS2404 all=m
 RTC_DRV_DA9052 all=m
@@ -5734,7 +5868,7 @@ SCSI_LPFC_DEBUG_FS all=n
 SCSI_SIM710 alpha=m i386=m
 SCSI_SYM53C416 alpha=m i386=m
 SCSI_DC395x all=m
-SCSI_DC390T all=m
+SCSI_AM53C974 all=m
 SCSI_T128 alpha=m i386=m
 SCSI_U14_34F alpha=m i386=m
 SCSI_U14_34F_TAGGED_QUEUE alpha=y i386=y
@@ -5742,6 +5876,7 @@ SCSI_U14_34F_LINKED_COMMANDS alpha=y i386=y
 SCSI_U14_34F_MAX_TAGS alpha=8 i386=8
 SCSI_ULTRASTOR i386=m
 SCSI_NSP32 i386=m ppc=n sparc=n
+SCSI_WD719X all=m
 SCSI_DEBUG all=m
 SCSI_MESH ppc=m
 SCSI_MESH_SYNC_RATE ppc=5
@@ -5926,6 +6061,8 @@ SPI_MASTER all=y
 SPI_ALTERA all=m
 SPI_BITBANG all=m
 SPI_BUTTERFLY all=m
+SPI_CADENCE all=m
+SPI_DLN2 all=m
 SPI_GPIO all=m
 SPI_LM70_LLP all=m
 SPI_MPC52xx_PSC ppc=m
@@ -5974,18 +6111,17 @@ STAGING all=y
 #- file drivers/staging/rtl8188eu/Kconfig goes here
 #- file drivers/staging/rtl8723au/Kconfig goes here
 #- file drivers/staging/rts5208/Kconfig goes here
-#- file drivers/staging/line6/Kconfig goes here
 #- file drivers/staging/octeon/Kconfig goes here
 #- file drivers/staging/octeon-usb/Kconfig goes here
 #- file drivers/staging/vt6655/Kconfig goes here
 #- file drivers/staging/vt6656/Kconfig goes here
 #- file drivers/staging/iio/Kconfig goes here
+#- file drivers/staging/sm7xxfb/Kconfig goes here
+#- file drivers/staging/sm750fb/Kconfig goes here
 #- file drivers/staging/xgifb/Kconfig goes here
 #- file drivers/staging/emxx_udc/Kconfig goes here
-#- file drivers/staging/bcm/Kconfig goes here
 #- file drivers/staging/ft1000/Kconfig goes here
 #- file drivers/staging/speakup/Kconfig goes here
-#- file drivers/staging/cptm1217/Kconfig goes here
 #- file drivers/staging/ste_rmi4/Kconfig goes here
 #- file drivers/staging/nvec/Kconfig goes here
 #- file drivers/staging/media/Kconfig goes here
@@ -5994,7 +6130,6 @@ STAGING all=y
 #- file drivers/staging/ozwpan/Kconfig goes here
 #- file drivers/staging/gdm72xx/Kconfig goes here
 #- file drivers/staging/gdm724x/Kconfig goes here
-#- file drivers/staging/imx-drm/Kconfig goes here
 #- file drivers/staging/fwserial/Kconfig goes here
 #- file drivers/staging/goldfish/Kconfig goes here
 #- file drivers/staging/netlogic/Kconfig goes here
@@ -6005,17 +6140,10 @@ STAGING all=y
 #- file drivers/staging/gs_fpgaboot/Kconfig goes here
 #- file drivers/staging/skein/Kconfig goes here
 #- file drivers/staging/unisys/Kconfig goes here
-
-#-
-#- *** FILE: drivers/staging/android/Kconfig ***
-#-
-ANDROID all=n
-#- file drivers/staging/android/ion/Kconfig goes here
-
-#-
-#- *** FILE: drivers/staging/bcm/Kconfig ***
-#-
-BCM_WIMAX all=m
+#- file drivers/staging/clocking-wizard/Kconfig goes here
+#- file drivers/staging/fbtft/Kconfig goes here
+#- file drivers/staging/i2o/Kconfig goes here
+#- file drivers/staging/fsl-mc/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
@@ -6072,9 +6200,8 @@ COMEDI_PCMMIO all=m
 COMEDI_PCMUIO all=m
 COMEDI_MULTIQ3 all=m
 COMEDI_S526 all=m
-COMEDI_PCI_DRIVERS all=y
+COMEDI_PCI_DRIVERS all=m
 COMEDI_8255_PCI all=m
-COMEDI_ADDI_APCI_035 all=m
 COMEDI_ADDI_APCI_1032 all=m
 COMEDI_ADDI_APCI_1500 all=m
 COMEDI_ADDI_APCI_1516 all=m
@@ -6126,7 +6253,7 @@ COMEDI_NI_PCIMIO all=m
 COMEDI_RTD520 all=m
 COMEDI_S626 all=m
 COMEDI_MITE all=m
-COMEDI_PCMCIA_DRIVERS all=y
+COMEDI_PCMCIA_DRIVERS all=m
 COMEDI_CB_DAS16_CS all=m
 COMEDI_DAS08_CS all=m
 COMEDI_NI_DAQ_700_CS all=m
@@ -6134,7 +6261,7 @@ COMEDI_NI_DAQ_DIO24_CS all=m
 COMEDI_NI_LABPC_CS all=m
 COMEDI_NI_MIO_CS all=m
 COMEDI_QUATECH_DAQP_CS all=m
-COMEDI_USB_DRIVERS all=y
+COMEDI_USB_DRIVERS all=m
 COMEDI_DT9812 all=m
 COMEDI_NI_USB6501 all=m
 COMEDI_USBDUX all=m
@@ -6147,11 +6274,6 @@ COMEDI_AMPLC_PC236 all=m
 COMEDI_NI_LABPC all=m
 COMEDI_NI_TIO all=m
 
-#-
-#- *** FILE: drivers/staging/cptm1217/Kconfig ***
-#-
-TOUCHSCREEN_CLEARPAD_TM1217 all=m
-
 #-
 #- *** FILE: drivers/staging/dgap/Kconfig ***
 #-
@@ -6162,6 +6284,39 @@ DGAP all=m
 #-
 DGNC all=m
 
+#-
+#- *** FILE: drivers/staging/fbtft/Kconfig ***
+#-
+FB_TFT all=m
+FB_TFT_AGM1264K_FL all=m
+FB_TFT_BD663474 all=m
+FB_TFT_HX8340BN all=m
+FB_TFT_HX8347D all=m
+FB_TFT_HX8353D all=m
+FB_TFT_ILI9163 all=m
+FB_TFT_ILI9320 all=m
+FB_TFT_ILI9325 all=m
+FB_TFT_ILI9340 all=m
+FB_TFT_ILI9341 all=m
+FB_TFT_ILI9481 all=m
+FB_TFT_ILI9486 all=m
+FB_TFT_PCD8544 all=m
+FB_TFT_RA8875 all=m
+FB_TFT_S6D02A1 all=m
+FB_TFT_S6D1121 all=m
+FB_TFT_SSD1289 all=m
+FB_TFT_SSD1306 all=m
+FB_TFT_SSD1331 all=m
+FB_TFT_SSD1351 all=m
+FB_TFT_ST7735R all=m
+FB_TFT_TINYLCD all=m
+FB_TFT_TLS8204 all=m
+FB_TFT_UC1701 all=m
+FB_TFT_UPD161704 all=m
+FB_TFT_WATTEROTT all=m
+FB_FLEX all=m
+FB_TFT_FBTFT_DEVICE all=m
+
 #-
 #- *** FILE: drivers/staging/ft1000/Kconfig ***
 #-
@@ -6197,6 +6352,20 @@ WIMAX_GDM72XX_USB_PM all=y
 #-
 GS_FPGABOOT all=m
 
+#-
+#- *** FILE: drivers/staging/i2o/Kconfig ***
+#-
+I2O all=m sparc=n
+I2O_LCT_NOTIFY_ON_CHANGES all=y
+I2O_EXT_ADAPTEC all=y
+I2O_EXT_ADAPTEC_DMA64 all=y
+I2O_CONFIG all=m sparc64=n
+I2O_CONFIG_OLD_IOCTL all=y x86_64=n
+I2O_BUS all=m
+I2O_BLOCK all=m
+I2O_SCSI all=m
+I2O_PROC all=m
+
 #-
 #- *** FILE: drivers/staging/iio/Kconfig ***
 #-
@@ -6308,12 +6477,6 @@ AD2S1210 all=m
 #- Triggers - standalone
 IIO_PERIODIC_RTC_TRIGGER all=m
 
-#-
-#- *** FILE: drivers/staging/line6/Kconfig ***
-#-
-LINE6_USB all=m
-LINE6_USB_IMPULSE_RESPONSE all=n
-
 #-
 #- *** FILE: drivers/staging/lustre/lnet/Kconfig ***
 #-
@@ -6337,7 +6500,8 @@ STAGING_MEDIA all=y
 #- file drivers/staging/media/cxd2099/Kconfig goes here
 #- file drivers/staging/media/davinci_vpfe/Kconfig goes here
 #- file drivers/staging/media/dt3155v4l/Kconfig goes here
-#- file drivers/staging/media/omap24xx/Kconfig goes here
+#- file drivers/staging/media/mn88472/Kconfig goes here
+#- file drivers/staging/media/mn88473/Kconfig goes here
 #- file drivers/staging/media/omap4iss/Kconfig goes here
 #- file drivers/staging/media/lirc/Kconfig goes here
 
@@ -6363,7 +6527,6 @@ DT3155_STREAMING all=y
 #-
 LIRC_STAGING all=y
 LIRC_BT829 all=m
-LIRC_IGORPLUGUSB all=m
 LIRC_IMON all=m
 LIRC_PARALLEL all=m
 LIRC_SASEM all=m
@@ -6373,10 +6536,14 @@ LIRC_SIR all=m
 LIRC_ZILOG all=m
 
 #-
-#- *** FILE: drivers/staging/media/omap24xx/Kconfig ***
+#- *** FILE: drivers/staging/media/mn88472/Kconfig ***
+#-
+DVB_MN88472 all=m
+
+#-
+#- *** FILE: drivers/staging/media/mn88473/Kconfig ***
 #-
-VIDEO_V4L2_INT_DEVICE all=m
-VIDEO_TCM825X all=m
+DVB_MN88473 all=m
 
 #-
 #- *** FILE: drivers/staging/mt29f_spinand/Kconfig ***
@@ -6449,6 +6616,16 @@ CRYPTO_SKEIN all=y
 #-
 SLICOSS all=m
 
+#-
+#- *** FILE: drivers/staging/sm750fb/Kconfig ***
+#-
+FB_SM750 all=m
+
+#-
+#- *** FILE: drivers/staging/sm7xxfb/Kconfig ***
+#-
+FB_SM7XX all=m
+
 #-
 #- *** FILE: drivers/staging/speakup/Kconfig ***
 #-
@@ -6481,16 +6658,10 @@ UNISYSSPAR all=y
 #- file drivers/staging/unisys/visorutil/Kconfig goes here
 #- file drivers/staging/unisys/visorchannel/Kconfig goes here
 #- file drivers/staging/unisys/visorchipset/Kconfig goes here
-#- file drivers/staging/unisys/channels/Kconfig goes here
 #- file drivers/staging/unisys/uislib/Kconfig goes here
 #- file drivers/staging/unisys/virtpci/Kconfig goes here
 #- file drivers/staging/unisys/virthba/Kconfig goes here
 
-#-
-#- *** FILE: drivers/staging/unisys/channels/Kconfig ***
-#-
-UNISYS_CHANNELSTUB all=m
-
 #-
 #- *** FILE: drivers/staging/unisys/uislib/Kconfig ***
 #-
@@ -6555,7 +6726,7 @@ TARGET_CORE all=m
 TCM_IBLOCK all=m
 TCM_FILEIO all=m
 TCM_PSCSI all=m
-TCM_USER all=m
+TCM_USER2 all=m
 #- file drivers/target/loopback/Kconfig goes here
 #- file drivers/target/tcm_fc/Kconfig goes here
 #- file drivers/target/iscsi/Kconfig goes here
@@ -6678,8 +6849,6 @@ SERIAL_8250_FINTEK all=m
 SERIAL_KGDB_NMI all=n
 SERIAL_MAX3100 all=m
 SERIAL_MAX310X all=y
-SERIAL_MRST_MAX3110 all=m
-SERIAL_MFD_HSU all=m
 SERIAL_UARTLITE all=m
 SERIAL_SUNCORE sparc=y sparc64=y
 SERIAL_SUNZILOG sparc=y sparc64=y
@@ -6759,6 +6928,7 @@ USB all=m sparc=n
 #- file drivers/usb/dwc3/Kconfig goes here
 #- file drivers/usb/dwc2/Kconfig goes here
 #- file drivers/usb/chipidea/Kconfig goes here
+#- file drivers/usb/isp1760/Kconfig goes here
 #- USB port drivers
 USB_USS720 all=m
 #- file drivers/usb/serial/Kconfig goes here
@@ -6810,7 +6980,7 @@ USB_OTG_FSM all=m
 #- *** FILE: drivers/usb/dwc2/Kconfig ***
 #-
 USB_DWC2 all=n
-#- Gadget mode requires USB Gadget support to be enabled
+#- Gadget/Dual-role mode requires USB Gadget support to be enabled
 USB_DWC2_DEBUG all=n
 USB_DWC2_TRACK_MISSED_SOFS all=n
 
@@ -6828,7 +6998,6 @@ USB_DWC3_PCI all=m
 USB_DWC3_KEYSTONE all=m
 #- Debugging features
 USB_DWC3_DEBUG all=n
-DWC3_HOST_USB3_LPM_ENABLE all=y
 
 #-
 #- *** FILE: drivers/usb/gadget/Kconfig ***
@@ -6840,6 +7009,9 @@ USB_GADGET_DEBUG_FS all=n
 USB_GADGET_VBUS_DRAW all=2
 USB_GADGET_STORAGE_NUM_BUFFERS all=2
 #- file drivers/usb/gadget/udc/Kconfig goes here
+USB_F_UAC2 all=m
+USB_F_MIDI all=m
+USB_F_HID all=m
 USB_CONFIGFS all=m
 USB_CONFIGFS_SERIAL all=y
 USB_CONFIGFS_ACM all=y
@@ -6853,6 +7025,12 @@ USB_CONFIGFS_PHONET all=y
 USB_CONFIGFS_MASS_STORAGE all=y
 USB_CONFIGFS_F_LB_SS all=y
 USB_CONFIGFS_F_FS all=y
+USB_CONFIGFS_F_UAC1 all=y
+USB_CONFIGFS_F_UAC2 all=y
+USB_CONFIGFS_F_MIDI all=y
+USB_CONFIGFS_F_HID all=y
+USB_CONFIGFS_F_UVC all=y
+USB_CONFIGFS_F_PRINTER all=y
 #- file drivers/usb/gadget/legacy/Kconfig goes here
 
 #-
@@ -6899,6 +7077,7 @@ USB_PXA27X all=n
 USB_MV_UDC all=m
 USB_MV_U3D all=m
 USB_M66592 all=m
+#- file drivers/usb/gadget/udc/bdc/Kconfig goes here
 USB_AMD5536UDC all=m
 USB_NET2272 all=m
 USB_NET2272_DMA all=y
@@ -6907,6 +7086,13 @@ USB_GOKU all=m
 USB_EG20T all=m
 USB_DUMMY_HCD all=m
 
+#-
+#- *** FILE: drivers/usb/gadget/udc/bdc/Kconfig ***
+#-
+USB_BDC_UDC all=m
+#- Platform Support
+USB_BDC_PCI all=m
+
 #-
 #- *** FILE: drivers/usb/host/Kconfig ***
 #-
@@ -6921,7 +7107,6 @@ USB_EHCI_HCD_PPC_OF ppc=y ppc64=y
 USB_EHCI_MV all=y
 USB_OXU210HP_HCD all=m
 USB_ISP116X_HCD all=m
-USB_ISP1760_HCD all=m
 USB_ISP1362_HCD all=m
 USB_FUSBH200_HCD all=m
 USB_FOTG210_HCD all=m
@@ -6952,6 +7137,15 @@ USB_HCD_TEST_MODE all=n
 USB_MDC800 all=m
 USB_MICROTEK all=m
 
+#-
+#- *** FILE: drivers/usb/isp1760/Kconfig ***
+#-
+USB_ISP1760 all=m
+USB_ISP1760_HCD all=m
+USB_ISP1760_HOST_ROLE all=n
+USB_ISP1760_GADGET_ROLE all=n
+USB_ISP1760_DUAL_ROLE all=y
+
 #-
 #- *** FILE: drivers/usb/misc/Kconfig ***
 #-
@@ -6980,6 +7174,7 @@ USB_YUREX all=m
 USB_EZUSB_FX2 all=m
 USB_HSIC_USB3503 all=m
 USB_LINK_LAYER_TEST all=m
+USB_CHAOSKEY all=m
 
 #-
 #- *** FILE: drivers/usb/misc/sisusbvga/Kconfig ***
@@ -6996,6 +7191,7 @@ USB_MON all=m
 #- *** FILE: drivers/usb/musb/Kconfig ***
 #-
 USB_MUSB_HDRC all=n
+#- Platform Glue Layer
 
 #-
 #- *** FILE: drivers/usb/phy/Kconfig ***
@@ -7136,12 +7332,15 @@ UWB_I1480U all=m
 #-
 VFIO all=m
 #- file drivers/vfio/pci/Kconfig goes here
+#- file drivers/vfio/platform/Kconfig goes here
 
 #-
 #- *** FILE: drivers/vfio/pci/Kconfig ***
 #-
 VFIO_PCI all=m
 VFIO_PCI_VGA all=y
+VFIO_PCI_MMAP all=y
+VFIO_PCI_INTX all=y
 
 #-
 #- *** FILE: drivers/vhost/Kconfig ***
@@ -7198,6 +7397,7 @@ BACKLIGHT_LM3630A all=m
 BACKLIGHT_LM3639 all=m
 BACKLIGHT_LP855X all=m
 BACKLIGHT_OT200 all=m
+BACKLIGHT_SKY81452 all=m
 BACKLIGHT_TPS65217 all=m
 BACKLIGHT_GPIO all=m
 BACKLIGHT_LV5207LP all=m
@@ -7211,6 +7411,8 @@ VGACON_SOFT_SCROLLBACK all=n ia64=y
 VGACON_SOFT_SCROLLBACK_SIZE ia64=64
 MDA_CONSOLE alpha=m i386=m
 DUMMY_CONSOLE all=y
+DUMMY_CONSOLE_COLUMNS all=80
+DUMMY_CONSOLE_ROWS all=25
 FRAMEBUFFER_CONSOLE all=y
 FRAMEBUFFER_CONSOLE_ROTATION all=y
 
@@ -7383,7 +7585,9 @@ VIRT_DRIVERS all=y
 #-
 VIRTIO all=m
 VIRTIO_PCI all=m
+VIRTIO_PCI_LEGACY all=y
 VIRTIO_BALLOON all=m
+VIRTIO_INPUT all=m
 VIRTIO_MMIO all=m
 VIRTIO_MMIO_CMDLINE_DEVICES all=y
 
@@ -7458,6 +7662,7 @@ MENF21BMC_WATCHDOG all=m
 WM831X_WATCHDOG all=m
 WM8350_WATCHDOG all=m
 XILINX_WATCHDOG all=m
+CADENCE_WATCHDOG all=m
 DW_WATCHDOG all=m
 RN5T618_WATCHDOG all=m
 TWL4030_WATCHDOG powerpc=m
@@ -7522,6 +7727,7 @@ USBPCWATCHDOG all=m
 XEN_BALLOON all=y
 XEN_SELFBALLOONING all=y
 XEN_BALLOON_MEMORY_HOTPLUG all=y
+XEN_BALLOON_MEMORY_HOTPLUG_LIMIT all=512
 XEN_SCRUB_PAGES all=y
 XEN_DEV_EVTCHN all=m
 XEN_BACKEND all=y
@@ -7549,7 +7755,6 @@ XEN_MCE_LOG all=y
 #- file fs/ext2/Kconfig goes here
 #- file fs/ext3/Kconfig goes here
 #- file fs/ext4/Kconfig goes here
-FS_XIP all=y
 #- file fs/jbd/Kconfig goes here
 #- file fs/jbd2/Kconfig goes here
 FS_MBCACHE all=m
@@ -7560,6 +7765,9 @@ FS_MBCACHE all=m
 #- file fs/ocfs2/Kconfig goes here
 #- file fs/btrfs/Kconfig goes here
 #- file fs/nilfs2/Kconfig goes here
+#- file fs/f2fs/Kconfig goes here
+#- file fs/aufs/Kconfig goes here
+FS_DAX all=y
 FS_POSIX_ACL all=y
 FILE_LOCKING all=y
 #- file fs/notify/Kconfig goes here
@@ -7581,6 +7789,7 @@ TMPFS_POSIX_ACL all=y
 TMPFS_XATTR all=y
 HUGETLBFS all=y alpha= sparc= sparc64=y
 #- file fs/configfs/Kconfig goes here
+#- file fs/efivarfs/Kconfig goes here
 MISC_FILESYSTEMS all=y
 #- file fs/adfs/Kconfig goes here
 #- file fs/affs/Kconfig goes here
@@ -7606,9 +7815,6 @@ MISC_FILESYSTEMS all=y
 #- file fs/sysv/Kconfig goes here
 #- file fs/ufs/Kconfig goes here
 #- file fs/exofs/Kconfig goes here
-#- file fs/f2fs/Kconfig goes here
-#- file fs/efivarfs/Kconfig goes here
-#- file fs/aufs/Kconfig goes here
 #- file fs/exofs/Kconfig.ore goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
@@ -7763,16 +7969,15 @@ EXOFS_DEBUG all=n
 #-
 #- *** FILE: fs/ext2/Kconfig ***
 #-
-EXT2_FS all=m
+EXT2_FS all=n
 EXT2_FS_XATTR all=y
 EXT2_FS_POSIX_ACL all=y
 EXT2_FS_SECURITY all=y
-EXT2_FS_XIP all=y
 
 #-
 #- *** FILE: fs/ext3/Kconfig ***
 #-
-EXT3_FS all=m
+EXT3_FS all=n
 EXT3_DEFAULTS_TO_ORDERED all=n
 EXT3_FS_XATTR all=y
 EXT3_FS_POSIX_ACL all=y
@@ -7782,8 +7987,10 @@ EXT3_FS_SECURITY all=y
 #- *** FILE: fs/ext4/Kconfig ***
 #-
 EXT4_FS all=m
+EXT4_USE_FOR_EXT23 all=y
 EXT4_FS_POSIX_ACL all=y
 EXT4_FS_SECURITY all=y
+EXT4_ENCRYPTION all=m
 EXT4_DEBUG all=n
 
 #-
@@ -7795,6 +8002,7 @@ F2FS_FS_XATTR all=y
 F2FS_FS_POSIX_ACL all=y
 F2FS_FS_SECURITY all=y
 F2FS_CHECK_FS all=y
+F2FS_IO_TRACE all=y
 
 #-
 #- *** FILE: fs/fat/Kconfig ***
@@ -7940,6 +8148,7 @@ NFSD_V2_ACL all=y
 NFSD_V3 all=y
 NFSD_V3_ACL all=y
 NFSD_V4 all=y
+NFSD_PNFS all=y
 NFSD_V4_SECURITY_LABEL all=y
 NFSD_FAULT_INJECTION all=n
 
@@ -8058,6 +8267,7 @@ PROC_SYSCTL all=y
 #-
 PSTORE all=y
 PSTORE_CONSOLE all=y
+PSTORE_PMSG all=y
 PSTORE_FTRACE all=n
 PSTORE_RAM all=m
 
@@ -8110,6 +8320,7 @@ SQUASHFS_DECOMP_MULTI all=n
 SQUASHFS_DECOMP_MULTI_PERCPU all=y
 SQUASHFS_XATTR all=y
 SQUASHFS_ZLIB all=y
+SQUASHFS_LZ4 all=y
 SQUASHFS_LZO all=y
 SQUASHFS_XZ all=y
 SQUASHFS_4K_DEVBLK_SIZE all=y
@@ -8201,6 +8412,7 @@ RCU_FANOUT all=32 alpha=64 ia64=64 ppc64=64 sparc64=64 x86_64=64
 RCU_FANOUT_LEAF all=16
 RCU_FANOUT_EXACT all=n
 RCU_FAST_NO_HZ all=y
+RCU_KTHREAD_PRIO all=0
 RCU_NOCB_CPU all=n
 RCU_NOCB_CPU_NONE all=y
 RCU_NOCB_CPU_ZERO all=n
@@ -8209,8 +8421,8 @@ IKCONFIG all=m
 IKCONFIG_PROC all=y
 LOG_BUF_SHIFT all=18
 LOG_CPU_MAX_BUF_SHIFT all=12
-NUMA_BALANCING_DEFAULT_ENABLED all=y
 NUMA_BALANCING all=y
+NUMA_BALANCING_DEFAULT_ENABLED all=y
 CGROUPS all=y
 CGROUP_DEBUG all=n
 CGROUP_FREEZER all=y
@@ -8218,7 +8430,7 @@ CGROUP_DEVICE all=y
 CPUSETS all=y
 PROC_PID_CPUSET all=n
 CGROUP_CPUACCT all=y
-RESOURCE_COUNTERS all=y
+PAGE_COUNTER all=y
 MEMCG all=y
 MEMCG_SWAP all=y
 MEMCG_SWAP_ENABLED all=y
@@ -8260,6 +8472,7 @@ EPOLL all=y
 SIGNALFD all=y
 TIMERFD all=y
 EVENTFD all=y
+BPF_SYSCALL all=y
 SHMEM all=y
 AIO all=y
 PCI_QUIRKS all=y
@@ -8318,9 +8531,15 @@ GCOV_KERNEL all=n
 #- *** FILE: kernel/irq/Kconfig ***
 #-
 GENERIC_IRQ_SHOW all=y
+GENERIC_MSI_IRQ all=y
 IRQ_DOMAIN_DEBUG all=n
 IRQ_FORCED_THREADING all=y
 
+#-
+#- *** FILE: kernel/livepatch/Kconfig ***
+#-
+LIVEPATCH all=y
+
 #-
 #- *** FILE: kernel/power/Kconfig ***
 #-
@@ -8335,7 +8554,6 @@ PM_AUTOSLEEP all=y
 PM_WAKELOCKS all=y
 PM_WAKELOCKS_LIMIT all=100
 PM_WAKELOCKS_GC all=y
-PM_RUNTIME all=y
 PM all=y
 PM_DEBUG all=n
 APM_EMULATION ppc=m
@@ -8380,6 +8598,7 @@ MMIOTRACE x86=n
 TRACEPOINT_BENCHMARK all=n
 RING_BUFFER_BENCHMARK all=m
 RING_BUFFER_STARTUP_TEST all=n
+TRACE_ENUM_MAP_FILE all=n
 
 #-
 #- *** FILE: lib/Kconfig ***
@@ -8433,12 +8652,14 @@ DEBUG_INFO all=y
 DEBUG_INFO_REDUCED all=n
 DEBUG_INFO_SPLIT all=y
 DEBUG_INFO_DWARF4 all=y
+GDB_SCRIPTS all=y
 ENABLE_WARN_DEPRECATED all=y
 ENABLE_MUST_CHECK all=y
 FRAME_WARN all=2048
 STRIP_ASM_SYMS all=y
 READABLE_ASM all=n
 UNUSED_SYMBOLS all=y
+PAGE_OWNER all=n
 #* required by oprofile
 DEBUG_FS all=y
 HEADERS_CHECK all=y
@@ -8459,6 +8680,7 @@ DEBUG_VIRTUAL all=n
 MEMORY_NOTIFIER_ERROR_INJECT all=m
 DEBUG_HIGHMEM i386=n sparc=n
 #- file lib/Kconfig.kmemcheck goes here
+#- file lib/Kconfig.kasan goes here
 DEBUG_SHIRQ all=n
 LOCKUP_DETECTOR all=y
 BOOTPARAM_HARDLOCKUP_PANIC all=n
@@ -8472,6 +8694,7 @@ PANIC_TIMEOUT all=180
 SCHED_DEBUG all=n
 SCHEDSTATS all=n
 SCHED_STACK_END_CHECK all=y
+DEBUG_TIMEKEEPING all=n
 TIMER_STATS all=y
 DEBUG_RT_MUTEXES all=n
 RT_MUTEX_TESTER all=n
@@ -8494,6 +8717,7 @@ DEBUG_NOTIFIERS all=n
 DEBUG_CREDENTIALS all=n
 SPARSE_RCU_POINTER all=n
 RCU_TORTURE_TEST all=m
+RCU_TORTURE_TEST_SLOW_INIT all=n
 RCU_CPU_STALL_TIMEOUT all=60
 RCU_CPU_STALL_INFO all=n
 RCU_TRACE all=n
@@ -8513,6 +8737,7 @@ INTERVAL_TREE_TEST all=m
 PERCPU_TEST all=m
 ATOMIC64_SELFTEST all=n
 ASYNC_RAID6_TEST all=m
+TEST_HEXDUMP all=m
 TEST_STRING_HELPERS all=m
 TEST_KSTRTOX all=m
 TEST_RHASHTABLE all=n
@@ -8527,6 +8752,11 @@ TEST_UDELAY all=m
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
 
+#-
+#- *** FILE: lib/Kconfig.kasan ***
+#-
+KASAN all=n
+
 #-
 #- *** FILE: lib/Kconfig.kgdb ***
 #-
@@ -8536,6 +8766,7 @@ KGDB_TESTS all=y
 KGDB_TESTS_ON_BOOT all=n
 KGDB_LOW_LEVEL_TRAP all=n
 KGDB_KDB all=y
+KDB_DEFAULT_ENABLE all=0x0
 KDB_KEYBOARD all=y
 KDB_CONTINUE_CATASTROPHIC all=0
 
@@ -8598,15 +8829,18 @@ CLEANCACHE all=y
 FRONTSWAP all=y
 CMA all=y
 CMA_DEBUG all=n
+CMA_DEBUGFS all=n
 CMA_AREAS all=7
 ZSWAP all=y
 ZBUD all=m
 ZSMALLOC all=y
 PGTABLE_MAPPING all=n
+ZSMALLOC_STAT all=y
 
 #-
 #- *** FILE: mm/Kconfig.debug ***
 #-
+PAGE_EXTENSION all=n
 DEBUG_PAGEALLOC all=n
 PAGE_POISONING sparc=n ia64=n alpha=n
 
@@ -8614,6 +8848,14 @@ PAGE_POISONING sparc=n ia64=n alpha=n
 #- *** FILE: net/6lowpan/Kconfig ***
 #-
 6LOWPAN all=m
+6LOWPAN_NHC all=m
+6LOWPAN_NHC_DEST all=m
+6LOWPAN_NHC_FRAGMENT all=m
+6LOWPAN_NHC_HOP all=m
+6LOWPAN_NHC_IPV6 all=m
+6LOWPAN_NHC_MOBILITY all=m
+6LOWPAN_NHC_ROUTING all=m
+6LOWPAN_NHC_UDP all=m
 
 #-
 #- *** FILE: net/8021q/Kconfig ***
@@ -8647,7 +8889,7 @@ NETWORK_PHY_TIMESTAMPING all=n
 NETFILTER all=y
 NETFILTER_DEBUG all=n
 NETFILTER_ADVANCED all=y
-BRIDGE_NETFILTER all=y
+BRIDGE_NETFILTER all=m
 #- file net/netfilter/Kconfig goes here
 #- file net/ipv4/netfilter/Kconfig goes here
 #- file net/ipv6/netfilter/Kconfig goes here
@@ -8682,6 +8924,7 @@ BRIDGE_NETFILTER all=y
 #- file net/netlink/Kconfig goes here
 #- file net/mpls/Kconfig goes here
 #- file net/hsr/Kconfig goes here
+#- file net/switchdev/Kconfig goes here
 RFS_ACCEL all=y
 CGROUP_NET_PRIO all=y
 BPF_JIT all=y
@@ -8741,11 +8984,15 @@ BATMAN_ADV_DEBUG all=n
 #- *** FILE: net/bluetooth/Kconfig ***
 #-
 BT all=m
-BT_6LOWPAN all=y
+BT_BREDR all=y
 #- file net/bluetooth/rfcomm/Kconfig goes here
 #- file net/bluetooth/bnep/Kconfig goes here
 #- file net/bluetooth/cmtp/Kconfig goes here
 #- file net/bluetooth/hidp/Kconfig goes here
+BT_LE all=y
+BT_6LOWPAN all=y
+BT_SELFTEST all=n
+BT_DEBUGFS all=n
 #- file drivers/bluetooth/Kconfig goes here
 
 #-
@@ -8879,11 +9126,17 @@ NET_DSA all=y
 #-
 HSR all=m
 
+#-
+#- *** FILE: net/ieee802154/6lowpan/Kconfig ***
+#-
+IEEE802154_6LOWPAN all=m
+
 #-
 #- *** FILE: net/ieee802154/Kconfig ***
 #-
 IEEE802154 all=m
-IEEE802154_6LOWPAN all=m
+IEEE802154_SOCKET all=m
+#- file net/ieee802154/6lowpan/Kconfig goes here
 
 #-
 #- *** FILE: net/ipv4/Kconfig ***
@@ -8910,6 +9163,7 @@ IP_PIMSM_V2 all=y
 SYN_COOKIES all=y
 NET_IPVTI all=m
 NET_FOU all=m
+NET_FOU_IP_TUNNELS all=y
 GENEVE all=m
 INET_AH all=m
 INET_ESP all=m
@@ -8951,16 +9205,17 @@ TCP_MD5SIG all=y
 #-
 NF_CONNTRACK_IPV4 all=m
 NF_CONNTRACK_PROC_COMPAT all=y
-NF_LOG_ARP all=m
-NF_LOG_IPV4 all=m
 NF_TABLES_IPV4 all=m
 NFT_CHAIN_ROUTE_IPV4 all=m
-NF_REJECT_IPV4 all=m
 NFT_REJECT_IPV4 all=m
 NF_TABLES_ARP all=m
+NF_LOG_ARP all=m
+NF_LOG_IPV4 all=m
+NF_REJECT_IPV4 all=m
 NF_NAT_IPV4 all=m
 NFT_CHAIN_NAT_IPV4 all=m
 NFT_MASQ_IPV4 all=m
+NFT_REDIR_IPV4 all=m
 NF_NAT_SNMP_BASIC all=m
 IP_NF_IPTABLES all=m
 IP_NF_MATCH_AH all=m
@@ -9023,6 +9278,7 @@ NF_LOG_IPV6 all=m
 NF_NAT_IPV6 all=m
 NFT_CHAIN_NAT_IPV6 all=m
 NFT_MASQ_IPV6 all=m
+NFT_REDIR_IPV6 all=m
 IP6_NF_IPTABLES all=m
 IP6_NF_MATCH_AH all=m
 IP6_NF_MATCH_EUI64 all=m
@@ -9124,6 +9380,7 @@ MAC802154 all=m
 #- *** FILE: net/mpls/Kconfig ***
 #-
 NET_MPLS_GSO all=m
+MPLS_ROUTING all=m
 
 #-
 #- *** FILE: net/netfilter/Kconfig ***
@@ -9158,6 +9415,7 @@ NF_CT_NETLINK_TIMEOUT all=m
 NF_CT_NETLINK_HELPER all=m
 NETFILTER_NETLINK_QUEUE_CT all=y
 NF_NAT all=m
+NF_NAT_REDIRECT all=m
 NF_TABLES all=m
 NF_TABLES_INET all=m
 NFT_EXTHDR all=m
@@ -9169,6 +9427,7 @@ NFT_COUNTER all=m
 NFT_LOG all=m
 NFT_LIMIT all=m
 NFT_MASQ all=m
+NFT_REDIR all=m
 NFT_NAT all=m
 NFT_QUEUE all=m
 NFT_REJECT all=m
@@ -9341,9 +9600,9 @@ NFC_NCI_SPI all=y
 #- *** FILE: net/openvswitch/Kconfig ***
 #-
 OPENVSWITCH all=m
-OPENVSWITCH_GRE all=y
-OPENVSWITCH_VXLAN all=y
-OPENVSWITCH_GENEVE all=y
+OPENVSWITCH_GRE all=m
+OPENVSWITCH_VXLAN all=m
+OPENVSWITCH_GENEVE all=m
 
 #-
 #- *** FILE: net/packet/Kconfig ***
@@ -9443,6 +9702,9 @@ NET_ACT_PEDIT all=m
 NET_ACT_SIMP all=m
 NET_ACT_SKBEDIT all=m
 NET_ACT_CSUM all=m
+NET_ACT_VLAN all=m
+NET_ACT_BPF all=m
+NET_ACT_CONNMARK all=m
 NET_CLS_IND all=y
 NET_SCH_FIFO all=y
 
@@ -9467,12 +9729,17 @@ SUNRPC_DEBUG all=y
 SUNRPC_XPRT_RDMA_CLIENT all=m
 SUNRPC_XPRT_RDMA_SERVER all=m
 
+#-
+#- *** FILE: net/switchdev/Kconfig ***
+#-
+NET_SWITCHDEV all=y
+
 #-
 #- *** FILE: net/tipc/Kconfig ***
 #-
 TIPC all=m
-TIPC_PORTS all=8191
 TIPC_MEDIA_IB all=y
+TIPC_MEDIA_UDP all=y
 
 #-
 #- *** FILE: net/unix/Kconfig ***
@@ -9590,7 +9857,6 @@ PERSISTENT_KEYRINGS all=y
 BIG_KEYS all=y
 TRUSTED_KEYS all=m
 ENCRYPTED_KEYS all=m
-KEYS_DEBUG_PROC_KEYS all=n
 
 #-
 #- *** FILE: security/selinux/Kconfig ***
@@ -9609,6 +9875,7 @@ SECURITY_SELINUX_POLICYDB_VERSION_MAX all=n
 #-
 SECURITY_SMACK all=y
 SECURITY_SMACK_BRINGUP all=y
+SECURITY_SMACK_NETFILTER all=y
 
 #-
 #- *** FILE: security/tomoyo/Kconfig ***
@@ -9637,6 +9904,7 @@ SND all=m
 #- file sound/drivers/Kconfig goes here
 #- file sound/isa/Kconfig goes here
 #- file sound/pci/Kconfig goes here
+#- file sound/hda/Kconfig goes here
 #- file sound/ppc/Kconfig goes here
 #- file sound/aoa/Kconfig goes here
 #- file sound/arm/Kconfig goes here
@@ -9732,7 +10000,7 @@ SND_AC97_POWER_SAVE_DEFAULT all=0
 SND_FIREWIRE all=y
 SND_FIREWIRE_LIB all=m
 SND_DICE all=m
-SND_FIREWIRE_SPEAKERS all=m
+SND_OXFW all=m
 SND_ISIGHT all=m
 SND_SCS1X all=m
 SND_FIREWORKS all=m
@@ -9963,6 +10231,7 @@ SND_SOC all=m
 #- file sound/soc/intel/Kconfig goes here
 #- file sound/soc/mxs/Kconfig goes here
 #- file sound/soc/pxa/Kconfig goes here
+#- file sound/soc/qcom/Kconfig goes here
 #- file sound/soc/rockchip/Kconfig goes here
 #- file sound/soc/samsung/Kconfig goes here
 #- file sound/soc/sh/Kconfig goes here
@@ -9971,6 +10240,7 @@ SND_SOC all=m
 #- file sound/soc/tegra/Kconfig goes here
 #- file sound/soc/txx9/Kconfig goes here
 #- file sound/soc/ux500/Kconfig goes here
+#- file sound/soc/xtensa/Kconfig goes here
 #- file sound/soc/codecs/Kconfig goes here
 #- file sound/soc/generic/Kconfig goes here
 
@@ -9991,12 +10261,16 @@ SND_SOC_AK4642 all=m
 SND_SOC_AK5386 all=m
 SND_SOC_ALC5623 all=m
 SND_SOC_CS35L32 all=m
+SND_SOC_CS42L51 all=m
+SND_SOC_CS42L51_I2C all=m
 SND_SOC_CS42L52 all=m
 SND_SOC_CS42L56 all=m
 SND_SOC_CS42L73 all=m
 SND_SOC_CS4265 all=m
 SND_SOC_CS4270 all=m
 SND_SOC_CS4271 all=m
+SND_SOC_CS4271_I2C all=m
+SND_SOC_CS4271_SPI all=m
 SND_SOC_CS42XX8_I2C all=m
 SND_SOC_HDMI_CODEC all=m
 SND_SOC_ES8328 all=m
@@ -10006,17 +10280,27 @@ SND_SOC_PCM1681 all=m
 SND_SOC_PCM1792A all=m
 SND_SOC_PCM512x_I2C all=m
 SND_SOC_PCM512x_SPI all=m
+SND_SOC_RT5631 all=m
+SND_SOC_RT5670 all=m
+SND_SOC_RT5677 all=m
+SND_SOC_RT5677_SPI all=m
 SND_SOC_SGTL5000 all=m
 SND_SOC_SIRF_AUDIO_CODEC all=m
 SND_SOC_SPDIF all=m
 SND_SOC_SSM2602_SPI all=m
 SND_SOC_SSM2602_I2C all=m
 SND_SOC_SSM4567 all=m
+SND_SOC_STA32X all=m
 SND_SOC_STA350 all=m
 SND_SOC_TAS2552 all=m
 SND_SOC_TAS5086 all=m
+SND_SOC_TFA9879 all=m
+SND_SOC_TLV320AIC23 all=m
+SND_SOC_TLV320AIC23_I2C all=m
+SND_SOC_TLV320AIC23_SPI all=m
 SND_SOC_TLV320AIC31XX all=m
 SND_SOC_TLV320AIC3X all=m
+SND_SOC_TS3A227E all=m
 SND_SOC_WM1250_EV1 all=m
 SND_SOC_WM8510 all=m
 SND_SOC_WM8523 all=m
@@ -10031,6 +10315,8 @@ SND_SOC_WM8753 all=m
 SND_SOC_WM8770 all=m
 SND_SOC_WM8776 all=m
 SND_SOC_WM8804 all=m
+SND_SOC_WM8804_I2C all=m
+SND_SOC_WM8804_SPI all=m
 SND_SOC_WM8903 all=m
 SND_SOC_WM8962 all=m
 SND_SOC_WM8978 all=m
@@ -10068,11 +10354,27 @@ SND_SIMPLE_CARD all=m
 #-
 #- *** FILE: sound/soc/intel/Kconfig ***
 #-
+SND_SST_MFLD_PLATFORM all=m
+SND_SST_IPC all=m
+SND_SST_IPC_ACPI all=m
 SND_SOC_INTEL_SST all=m
 SND_SOC_INTEL_HASWELL_MACH all=m
 SND_SOC_INTEL_BYT_RT5640_MACH all=m
 SND_SOC_INTEL_BYT_MAX98090_MACH all=m
 SND_SOC_INTEL_BROADWELL_MACH all=m
+SND_SOC_INTEL_BYTCR_RT5640_MACH all=m
+SND_SOC_INTEL_CHT_BSW_RT5672_MACH all=m
+SND_SOC_INTEL_CHT_BSW_RT5645_MACH all=m
+
+#-
+#- *** FILE: sound/soc/qcom/Kconfig ***
+#-
+SND_SOC_QCOM all=m
+
+#-
+#- *** FILE: sound/soc/xtensa/Kconfig ***
+#-
+SND_SOC_XTFPGA_I2S all=m
 
 #-
 #- *** FILE: sound/sparc/Kconfig ***
@@ -10102,6 +10404,15 @@ SND_USB_US122L all=m
 SND_USB_6FIRE all=m
 SND_USB_HIFACE all=m
 SND_BCD2000 all=m
+#- file sound/usb/line6/Kconfig goes here
+
+#-
+#- *** FILE: sound/usb/line6/Kconfig ***
+#-
+SND_USB_POD all=m
+SND_USB_PODHD all=m
+SND_USB_TONEPORT all=m
+SND_USB_VARIAX all=m
 
 #-
 #- *** FILE: usr/Kconfig ***
@@ -10112,3 +10423,37 @@ RD_BZIP2 all=y
 RD_LZMA all=y
 RD_XZ all=y
 RD_LZO all=y
+RD_LZ4 all=y
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+ARM_AT91_ETHER all=m
+BLK_DEV_CELLEB ppc64=m
+BLK_DEV_XIP all=y
+DWC3_HOST_USB3_LPM_ENABLE all=y
+EXT2_FS_XIP all=y
+FS_XIP all=y
+HID_HUION all=m
+INIT_FALLBACK all=y
+INTEL_MID_DMAC all=m
+KEYS_DEBUG_PROC_KEYS all=n
+LINE6_USB all=m
+LINE6_USB_IMPULSE_RESPONSE all=n
+MEDIA_PARPORT_SUPPORT all=y
+PATA_SCC ppc64=m
+SERIAL_MFD_HSU all=m
+SERIAL_MRST_MAX3110 all=m
+TCG_ST33_I2C all=m
+TCG_TIS_I2C_ST33 all=m
+TCM_USER all=m
+TIPC_PORTS all=8191
+TOUCHSCREEN_CLEARPAD_TM1217 all=m
+UNISYS_CHANNELSTUB all=m
+VIDEO_BTCX all=m sparc=
+VIDEO_BWQCAM all=m
+VIDEO_CQCAM all=m
+VIDEO_PMS all=m
+VIDEO_SAA7191 all=m
+VIDEO_TLG2300 all=m
+VIDEO_W9966 all=m