Revert another breaking patch from cip kernel

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

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 19ec1dfe0864074ea119f7cfa67becd1a063b27d..1d9407aa84150d54ecfdce41284adba6f358bfd0 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -2,6 +2,7 @@
 #-
 #- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
 #-
+AMD_MCE_INJ all=m
 ARCH_MEMORY_PROBE all=n
 CC_STACKPROTECTOR all=y
 CC_STACKPROTECTOR_NONE all=n
@@ -9,20 +10,22 @@ CC_STACKPROTECTOR_REGULAR all=n
 CC_STACKPROTECTOR_STRONG all=y
 DEBUG_ENTRY all=n
 DEBUG_IMR_SELFTEST all=n
+DEBUG_WX all=y
 EARLY_PRINTK_EFI all=n
 EFI_MIXED all=y
+EFI_PGT_DUMP all=n
 IOSF_MBI all=m
 IOSF_MBI_DEBUG all=y
 KEXEC_FILE all=y
 KEXEC_VERIFY_SIG all=n
 KVM_DEBUG_FS all=n
 KVM_DEVICE_ASSIGNMENT all=y
-PHYSICAL_ALIGN all=0x1000000
 PUNIT_ATOM_DEBUG all=m
+STATIC_KEYS_SELFTEST all=y
 X86_AMD_PLATFORM_DEVICE all=y
 X86_DEBUG_FPU all=n
-X86_DEBUG_STATIC_CPU_HAS all=n
 X86_SYSFB all=y
+XEN_512GB all=y
 XEN_PVH all=y
 
 #-
@@ -81,6 +84,12 @@ EFI_PARTITION all=y
 SYSV68_PARTITION all=y
 CMDLINE_PARTITION all=y
 
+#-
+#- *** FILE: certs/Kconfig ***
+#-
+SYSTEM_TRUSTED_KEYRING all=y
+SYSTEM_TRUSTED_KEYS all=""
+
 #-
 #- *** FILE: crypto/Kconfig ***
 #-
@@ -117,6 +126,7 @@ CRYPTO_ECB all=m
 CRYPTO_LRW all=m
 CRYPTO_PCBC all=m
 CRYPTO_XTS all=m
+CRYPTO_KEYWRAP all=m
 #- Hash modes
 CRYPTO_CMAC all=m
 CRYPTO_HMAC all=y
@@ -131,6 +141,7 @@ CRYPTO_CRCT10DIF all=m
 CRYPTO_CRCT10DIF_PCLMUL all=m
 CRYPTO_GHASH all=m
 CRYPTO_POLY1305 all=m
+CRYPTO_POLY1305_X86_64 all=m
 CRYPTO_MD4 all=m
 CRYPTO_MD5 all=y
 CRYPTO_MICHAEL_MIC all=m
@@ -173,6 +184,7 @@ CRYPTO_SALSA20 all=m
 CRYPTO_SALSA20_586 all=m
 CRYPTO_SALSA20_X86_64 x86_64=m
 CRYPTO_CHACHA20 all=m
+CRYPTO_CHACHA20_X86_64 all=m
 CRYPTO_SEED all=m
 CRYPTO_SERPENT all=m
 CRYPTO_SERPENT_SSE2_X86_64 all=m
@@ -205,6 +217,7 @@ CRYPTO_USER_API_RNG all=m
 CRYPTO_USER_API_AEAD all=m
 #- file drivers/crypto/Kconfig goes here
 #- file crypto/asymmetric_keys/Kconfig goes here
+#- file certs/Kconfig goes here
 
 #-
 #- *** FILE: crypto/asymmetric_keys/Kconfig ***
@@ -226,6 +239,7 @@ A11Y_BRAILLE_CONSOLE=y
 #- *** FILE: drivers/acpi/Kconfig ***
 #-
 ACPI ia64=y x86=y
+ACPI_DEBUGGER all=n
 ACPI_SLEEP x86=y
 ACPI_PROCFS_POWER ia64=y x86=y
 ACPI_REV_OVERRIDE_POSSIBLE all=y
@@ -423,7 +437,7 @@ PREVENT_FIRMWARE_BUILD all=y
 FIRMWARE_IN_KERNEL all=n
 EXTRA_FIRMWARE all=""
 FW_LOADER_USER_HELPER all=y
-FW_LOADER_USER_HELPER_FALLBACK all=y
+FW_LOADER_USER_HELPER_FALLBACK all=n
 WANT_DEV_COREDUMP all=y
 DEV_COREDUMP all=y
 DEBUG_DRIVER all=n
@@ -432,7 +446,7 @@ DEBUG_DEVRES all=n
 FENCE_TRACE all=n
 DMA_CMA all=y
 #- Default contiguous memory area size:
-CMA_SIZE_MBYTES all=16
+CMA_SIZE_MBYTES all=64
 CMA_SIZE_SEL_MBYTES all=y
 CMA_SIZE_SEL_PERCENTAGE all=n
 CMA_SIZE_SEL_MIN all=n
@@ -462,6 +476,7 @@ BCMA_DEBUG all=n
 BLK_DEV all=y
 BLK_DEV_NULL_BLK all=m
 BLK_DEV_FD all=m sparc=y
+BLK_DEV_FD_RAWCMD all=n
 MAC_FLOPPY ppc=m
 PARIDE all=m
 #- file drivers/block/paride/Kconfig goes here
@@ -478,7 +493,6 @@ BLK_DEV_LOOP_MIN_COUNT all=8
 BLK_DEV_CRYPTOLOOP all=n
 #- file drivers/block/drbd/Kconfig goes here
 BLK_DEV_NBD all=m
-BLK_DEV_NVME all=m
 BLK_DEV_SKD all=m
 BLK_DEV_OSD all=m
 BLK_DEV_SX8 all=m
@@ -559,6 +573,7 @@ BT_HCIUART_LL all=y
 BT_HCIUART_3WIRE all=y
 BT_HCIUART_INTEL all=y
 BT_HCIUART_BCM all=y
+BT_HCIUART_QCA all=y
 BT_HCIBCM203X all=m
 BT_HCIBPA10X all=m
 BT_HCIBFUSB all=m
@@ -797,6 +812,7 @@ CRYPTO_DEV_CCP_CRYPTO all=m
 #- *** FILE: drivers/crypto/qat/Kconfig ***
 #-
 CRYPTO_DEV_QAT_DH895xCC all=m
+CRYPTO_DEV_QAT_DH895xCCVF all=m
 
 #-
 #- *** FILE: drivers/devfreq/Kconfig ***
@@ -821,16 +837,17 @@ PM_DEVFREQ_EVENT all=y
 DMADEVICES all=y
 DMADEVICES_DEBUG all=n
 #- DMA Devices
-INTEL_MIC_X100_DMA all=m
+DMA_ENGINE all=y
+FSL_DMA ppc=y ppc64=y
+INTEL_IDMA64 all=m
 INTEL_IOATDMA i386=m x86_64=m
+INTEL_MIC_X100_DMA all=m
+PCH_DMA all=m
+TIMB_DMA all=m
+#- file drivers/dma/bestcomm/Kconfig goes here
 #- 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
-PCH_DMA all=m
-DMA_ENGINE all=y
 #- DMA Clients
 ASYNC_TX_DMA all=y
 DMATEST all=n
@@ -839,9 +856,9 @@ DMATEST all=n
 #- *** FILE: drivers/dma/dw/Kconfig ***
 #-
 DW_DMAC_CORE all=m
+DW_DMAC_BIG_ENDIAN_IO all=n
 DW_DMAC all=m
 DW_DMAC_PCI all=m
-DW_DMAC_BIG_ENDIAN_IO all=n
 
 #-
 #- *** FILE: drivers/dma/hsu/Kconfig ***
@@ -855,7 +872,6 @@ EDAC all=y
 EDAC_LEGACY_SYSFS all=y
 EDAC_DEBUG all=n
 EDAC_DECODE_MCE all=m
-EDAC_MCE_INJ all=m
 EDAC_MM_EDAC all=m
 EDAC_AMD64 all=m
 EDAC_AMD64_ERROR_INJECTION all=y
@@ -933,6 +949,8 @@ EFI_VARS all=m
 EFI_VARS_PSTORE all=m
 EFI_VARS_PSTORE_DEFAULT_DISABLE all=n
 EFI_RUNTIME_MAP all=y
+EFI_FAKE_MEMMAP all=n
+EFI_CAPSULE_LOADER all=m
 
 #-
 #- *** FILE: drivers/firmware/google/Kconfig ***
@@ -950,23 +968,33 @@ FMC_TRIVIAL all=m
 FMC_WRITE_EEPROM all=m
 FMC_CHARDEV all=m
 
+#-
+#- *** FILE: drivers/fpga/Kconfig ***
+#-
+FPGA all=m
+FPGA_MGR_ZYNQ_FPGA all=m
+
 #-
 #- *** FILE: drivers/gpio/Kconfig ***
 #-
 GPIOLIB all=y
 DEBUG_GPIO all=n
 GPIO_SYSFS all=y
+GPIO_AMDPT all=m
 GPIO_DWAPB all=m
-GPIO_F7188X all=m
+GPIO_EXAR all=m
 GPIO_GENERIC_PLATFORM all=m
 GPIO_ICH all=m
-GPIO_IT8761E all=m
 GPIO_LYNXPOINT all=y
+GPIO_VX855 all=m
+GPIO_XILINX powerpc=y
+GPIO_ZX all=y
+GPIO_104_IDIO_16 all=m
+GPIO_F7188X all=m
+GPIO_IT87 all=m
 GPIO_SCH all=m
 GPIO_SCH311X all=m
 GPIO_TS5500 all=m
-GPIO_VX855 all=m
-GPIO_XILINX powerpc=y
 GPIO_ADP5588 all=m
 GPIO_MAX7300 all=m
 GPIO_MAX732X all=m
@@ -994,17 +1022,17 @@ GPIO_PCH all=m
 GPIO_RDC321X all=m
 GPIO_74X164 all=m
 GPIO_MAX7301 all=m
-GPIO_MCP23S08 all=m
 GPIO_MC33880 all=m
+GPIO_MCP23S08 all=m
 GPIO_VIPERBOARD all=m
 
 #-
 #- *** FILE: drivers/gpu/drm/Kconfig ***
 #-
 DRM all=m
+DRM_FBDEV_EMULATION all=y
 DRM_LOAD_EDID_FIRMWARE all=y
 #- file drivers/gpu/drm/i2c/Kconfig goes here
-#- file drivers/gpu/drm/bridge/Kconfig goes here
 DRM_TDFX all=m
 DRM_R128 all=m
 DRM_RADEON all=m
@@ -1037,11 +1065,14 @@ DRM_VGEM all=m
 #- file drivers/gpu/drm/bochs/Kconfig goes here
 #- file drivers/gpu/drm/virtio/Kconfig goes here
 #- file drivers/gpu/drm/msm/Kconfig goes here
+#- file drivers/gpu/drm/fsl-dcu/Kconfig goes here
 #- file drivers/gpu/drm/tegra/Kconfig goes here
 #- file drivers/gpu/drm/panel/Kconfig goes here
+#- file drivers/gpu/drm/bridge/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/vc4/Kconfig goes here
 
 #-
 #- *** FILE: drivers/gpu/drm/amd/amdgpu/Kconfig ***
@@ -1064,11 +1095,6 @@ DRM_AST all=m
 #-
 DRM_BOCHS all=m
 
-#-
-#- *** FILE: drivers/gpu/drm/bridge/Kconfig ***
-#-
-DRM_PTN3460 all=m
-
 #-
 #- *** FILE: drivers/gpu/drm/cirrus/Kconfig ***
 #-
@@ -1093,8 +1119,6 @@ DRM_I2C_NXP_TDA998X all=m
 #- *** FILE: drivers/gpu/drm/i915/Kconfig ***
 #-
 DRM_I915 i386=m x86_64=m
-DRM_I915_KMS all=y
-DRM_I915_FBDEV all=y
 DRM_I915_PRELIMINARY_HW_SUPPORT all=y
 
 #-
@@ -1162,6 +1186,7 @@ HID_BELKIN all=m
 HID_BETOP_FF all=m
 HID_CHERRY all=m
 HID_CHICONY all=m
+HID_CORSAIR all=m
 HID_PRODIKEYS all=m
 HID_CP2112 all=m
 HID_CYPRESS all=m
@@ -1171,6 +1196,8 @@ HID_EMS_FF all=m
 HID_ELECOM all=m
 HID_ELO all=m
 HID_EZKEY all=m
+HID_GEMBIRD all=m
+HID_GFRM all=m
 HID_HOLTEK all=m
 HOLTEK_FF all=y
 HID_GT683R all=m
@@ -1344,6 +1371,7 @@ SENSORS_MAX6639 all=m
 SENSORS_MAX6642 all=m
 SENSORS_MAX6650 all=m
 SENSORS_MAX6697 all=m
+SENSORS_MAX31790 all=m
 SENSORS_HTU21 all=m
 SENSORS_MCP3021 all=m
 SENSORS_MENF21BMC_HWMON all=m
@@ -1431,6 +1459,7 @@ SENSORS_LM25066 all=m
 SENSORS_LTC2978 all=m
 SENSORS_LTC2978_REGULATOR all=y
 SENSORS_MAX16064 all=m
+SENSORS_MAX20751 all=m
 SENSORS_MAX34440 all=m
 SENSORS_MAX8688 all=m
 SENSORS_TPS40422 all=m
@@ -1438,6 +1467,24 @@ SENSORS_UCD9000 all=m
 SENSORS_UCD9200 all=m
 SENSORS_ZL6100 all=m
 
+#-
+#- *** FILE: drivers/hwtracing/intel_th/Kconfig ***
+#-
+INTEL_TH all=m
+INTEL_TH_PCI all=m
+INTEL_TH_GTH all=m
+INTEL_TH_STH all=m
+INTEL_TH_MSU all=m
+INTEL_TH_PTI all=m
+INTEL_TH_DEBUG all=n
+
+#-
+#- *** FILE: drivers/hwtracing/stm/Kconfig ***
+#-
+STM all=m
+STM_DUMMY all=n
+STM_SOURCE_CONSOLE all=m
+
 #-
 #- *** FILE: drivers/i2c/Kconfig ***
 #-
@@ -1497,6 +1544,7 @@ I2C_DESIGNWARE_PLATFORM all=m
 I2C_DESIGNWARE_PCI all=m
 I2C_DESIGNWARE_BAYTRAIL i386=y
 I2C_EG20T all=m
+I2C_EMEV2 all=m
 I2C_GPIO all=m
 I2C_KEMPLD all=m
 I2C_MPC ppc=n
@@ -1528,6 +1576,7 @@ I2C_MUX_GPIO all=m
 I2C_MUX_PCA9541 all=m
 I2C_MUX_PCA954x all=m
 I2C_MUX_PINCTRL all=m
+I2C_MUX_REG all=m
 
 #-
 #- *** FILE: drivers/ide/Kconfig ***
@@ -1612,13 +1661,13 @@ I7300_IDLE x86_64=m
 #- *** FILE: drivers/iio/Kconfig ***
 #-
 IIO all=m
-IIO_BUFFER_CB all=y
-IIO_KFIFO_BUF all=m
+#- file drivers/iio/buffer/Kconfig goes here
 IIO_TRIGGER all=y
 IIO_CONSUMERS_PER_TRIGGER all=2
 #- file drivers/iio/accel/Kconfig goes here
 #- file drivers/iio/adc/Kconfig goes here
 #- file drivers/iio/amplifiers/Kconfig goes here
+#- file drivers/iio/chemical/Kconfig goes here
 #- file drivers/iio/common/Kconfig goes here
 #- file drivers/iio/dac/Kconfig goes here
 #- file drivers/iio/frequency/Kconfig goes here
@@ -1629,6 +1678,7 @@ IIO_CONSUMERS_PER_TRIGGER all=2
 #- file drivers/iio/magnetometer/Kconfig goes here
 #- file drivers/iio/orientation/Kconfig goes here
 #- file drivers/iio/trigger/Kconfig goes here
+#- file drivers/iio/potentiometer/Kconfig goes here
 #- file drivers/iio/pressure/Kconfig goes here
 #- file drivers/iio/proximity/Kconfig goes here
 #- file drivers/iio/temperature/Kconfig goes here
@@ -1641,10 +1691,11 @@ BMC150_ACCEL all=m
 HID_SENSOR_ACCEL_3D all=m
 IIO_ST_ACCEL_3AXIS all=m
 KXSD9 all=m
-MMA8452 all=m
 KXCJK1013 all=m
+MMA8452 all=m
 MMA9551 all=m
 MMA9553 all=m
+MXC4005 all=m
 STK8312 all=m
 STK8BA50 all=m
 
@@ -1661,6 +1712,7 @@ AD7887 all=m
 AD7923 all=m
 AD799X all=m
 CC10001_ADC all=m
+HI8435 all=m
 MAX1027 all=m
 MAX1363 all=m
 MCP320X all=m
@@ -1670,6 +1722,7 @@ NAU7802 all=m
 QCOM_SPMI_IADC all=m
 QCOM_SPMI_VADC all=m
 TI_ADC081C all=m
+TI_ADC108S102 all=m
 TI_ADC128S052 all=m
 TI_AM335X_ADC all=m
 VIPERBOARD_ADC all=m
@@ -1679,6 +1732,17 @@ VIPERBOARD_ADC all=m
 #-
 AD8366 all=m
 
+#-
+#- *** FILE: drivers/iio/buffer/Kconfig ***
+#-
+IIO_BUFFER_CB all=y
+IIO_KFIFO_BUF all=m
+
+#-
+#- *** FILE: drivers/iio/chemical/Kconfig ***
+#-
+VZ89X all=m
+
 #-
 #- *** FILE: drivers/iio/common/ssp_sensors/Kconfig ***
 #-
@@ -1729,6 +1793,8 @@ ITG3200 all=m
 #- *** FILE: drivers/iio/humidity/Kconfig ***
 #-
 DHT11 all=m
+HDC100X all=m
+HTU21 all=m
 SI7005 all=m
 SI7020 all=m
 
@@ -1752,6 +1818,7 @@ ACPI_ALS all=m
 ADJD_S311 all=m
 AL3320A all=m
 APDS9300 all=m
+APDS9960 all=m
 BH1750 all=m
 CM32181 all=m
 CM3232 all=m
@@ -1762,13 +1829,17 @@ ISL29125 all=m
 HID_SENSOR_ALS all=m
 HID_SENSOR_PROX all=m
 JSA1212 all=m
+RPR0521 all=m
 SENSORS_LM3533 all=m
 LTR501 all=m
+OPT3001 all=m
+PA12203001 all=m
 STK3310 all=m
 TCS3414 all=m
 TCS3472 all=m
 SENSORS_TSL2563 all=m
 TSL4531 all=m
+US5182D all=m
 VCNL4000 all=m
 
 #-
@@ -1776,11 +1847,11 @@ VCNL4000 all=m
 #-
 AK8975 all=m
 AK09911 all=m
+BMC150_MAGN all=m
 MAG3110 all=m
 HID_SENSOR_MAGNETOMETER_3D all=m
 MMC35240 all=m
 IIO_ST_MAGN_3AXIS all=m
-BMC150_MAGN all=m
 
 #-
 #- *** FILE: drivers/iio/orientation/Kconfig ***
@@ -1788,6 +1859,11 @@ BMC150_MAGN all=m
 HID_SENSOR_INCLINOMETER_3D all=m
 HID_SENSOR_DEVICE_ROTATION all=m
 
+#-
+#- *** FILE: drivers/iio/potentiometer/Kconfig ***
+#-
+MCP4531 all=m
+
 #-
 #- *** FILE: drivers/iio/pressure/Kconfig ***
 #-
@@ -1798,6 +1874,7 @@ MPL3115 all=m
 MS5611 all=m
 MS5611_I2C all=m
 MS5611_SPI all=m
+MS5637 all=m
 IIO_ST_PRESS all=m
 T5403 all=m
 
@@ -1805,6 +1882,7 @@ T5403 all=m
 #- *** FILE: drivers/iio/proximity/Kconfig ***
 #-
 AS3935 all=m
+LIDAR_LITE_V2 all=m
 SX9500 all=m
 
 #-
@@ -1812,6 +1890,8 @@ SX9500 all=m
 #-
 MLX90614 all=m
 TMP006 all=m
+TSYS01 all=m
+TSYS02D all=m
 
 #-
 #- *** FILE: drivers/iio/trigger/Kconfig ***
@@ -1829,10 +1909,7 @@ 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
 #- file drivers/infiniband/hw/qib/Kconfig goes here
-#- file drivers/infiniband/hw/ehca/Kconfig goes here
-#- file drivers/infiniband/hw/amso1100/Kconfig goes here
 #- file drivers/infiniband/hw/cxgb3/Kconfig goes here
 #- file drivers/infiniband/hw/cxgb4/Kconfig goes here
 #- file drivers/infiniband/hw/mlx4/Kconfig goes here
@@ -1846,12 +1923,6 @@ INFINIBAND_ADDR_TRANS all=y sparc=
 #- file drivers/infiniband/ulp/iser/Kconfig goes here
 #- file drivers/infiniband/ulp/isert/Kconfig goes here
 
-#-
-#- *** FILE: drivers/infiniband/hw/amso1100/Kconfig ***
-#-
-INFINIBAND_AMSO1100 all=m sparc=
-INFINIBAND_AMSO1100_DEBUG all=n sparc=
-
 #-
 #- *** FILE: drivers/infiniband/hw/cxgb3/Kconfig ***
 #-
@@ -1863,11 +1934,6 @@ INFINIBAND_CXGB3_DEBUG all=n sparc=
 #-
 INFINIBAND_CXGB4 all=m
 
-#-
-#- *** FILE: drivers/infiniband/hw/ipath/Kconfig ***
-#-
-INFINIBAND_IPATH all=m
-
 #-
 #- *** FILE: drivers/infiniband/hw/mlx4/Kconfig ***
 #-
@@ -2140,6 +2206,7 @@ SERIO_ALTERA_PS2 all=m
 SERIO_PS2MULT all=m
 SERIO_ARC_PS2 all=m
 HYPERV_KEYBOARD all=m
+USERIO all=m
 
 #-
 #- *** FILE: drivers/input/tablet/Kconfig ***
@@ -2177,6 +2244,7 @@ TOUCHSCREEN_DYNAPRO all=m
 TOUCHSCREEN_HAMPSHIRE all=m
 TOUCHSCREEN_EETI all=m
 TOUCHSCREEN_EGALAX all=m
+TOUCHSCREEN_FT6236 all=m
 TOUCHSCREEN_FUJITSU all=m
 TOUCHSCREEN_GOODIX all=m
 TOUCHSCREEN_ILI210X all=m
@@ -2226,6 +2294,7 @@ TOUCHSCREEN_USB_ETT_TC45USB all=y
 TOUCHSCREEN_USB_NEXIO all=y
 TOUCHSCREEN_TOUCHIT213 all=m
 TOUCHSCREEN_TSC_SERIO all=m
+TOUCHSCREEN_TSC2004 all=m
 TOUCHSCREEN_TSC2005 all=m
 TOUCHSCREEN_TSC2007 all=m
 TOUCHSCREEN_W90X900 all=m
@@ -2236,6 +2305,7 @@ TOUCHSCREEN_SUR40 all=m
 TOUCHSCREEN_SX8654 all=m
 TOUCHSCREEN_TPS6507X all=m
 TOUCHSCREEN_ZFORCE all=m
+TOUCHSCREEN_ROHM_BU21023 all=m
 
 #-
 #- *** FILE: drivers/iommu/Kconfig ***
@@ -2243,6 +2313,7 @@ TOUCHSCREEN_ZFORCE all=m
 IOMMU_SUPPORT all=y
 AMD_IOMMU_V2 all=m
 INTEL_IOMMU all=y
+INTEL_IOMMU_SVM all=y
 INTEL_IOMMU_DEFAULT_ON all=y
 IRQ_REMAP all=y
 
@@ -2440,7 +2511,6 @@ 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
 
@@ -2465,6 +2535,14 @@ LEDS_TRIGGER_CAMERA all=m
 #-
 LGUEST i386=m
 
+#-
+#- *** FILE: drivers/lightnvm/Kconfig ***
+#-
+NVM all=y
+NVM_DEBUG all=n
+NVM_GENNVM all=m
+NVM_RRPC all=m
+
 #-
 #- *** FILE: drivers/macintosh/Kconfig ***
 #-
@@ -2780,13 +2858,13 @@ SMS_SDIO_DRV all=m
 MEDIA_PCI_SUPPORT all=y
 #- Media capture support
 #- file drivers/media/pci/meye/Kconfig goes here
+#- file drivers/media/pci/solo6x10/Kconfig goes here
 #- file drivers/media/pci/sta2x11/Kconfig goes here
+#- file drivers/media/pci/tw68/Kconfig goes here
+#- file drivers/media/pci/zoran/Kconfig goes here
 #- Media capture/analog TV support
 #- file drivers/media/pci/ivtv/Kconfig goes here
-#- file drivers/media/pci/zoran/Kconfig goes here
 #- file drivers/media/pci/saa7146/Kconfig goes here
-#- file drivers/media/pci/solo6x10/Kconfig goes here
-#- file drivers/media/pci/tw68/Kconfig goes here
 #- file drivers/media/pci/dt3155/Kconfig goes here
 #- Media capture/analog/hybrid TV support
 #- file drivers/media/pci/cx18/Kconfig goes here
@@ -2808,6 +2886,7 @@ MEDIA_PCI_SUPPORT all=y
 #- 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/netup_unidvb/Kconfig goes here
 
 #-
 #- *** FILE: drivers/media/pci/b2c2/Kconfig ***
@@ -2888,6 +2967,11 @@ DVB_HOPPER all=m
 #-
 VIDEO_MEYE i386=m x86_64=m
 
+#-
+#- *** FILE: drivers/media/pci/netup_unidvb/Kconfig ***
+#-
+DVB_NETUP_UNIDVB all=m
+
 #-
 #- *** FILE: drivers/media/pci/ngene/Kconfig ***
 #-
@@ -2988,6 +3072,8 @@ VIDEO_SH_VEU all=m
 VIDEO_RENESAS_VSP1 all=m
 V4L_TEST_DRIVERS all=n
 #- file drivers/media/platform/vivid/Kconfig goes here
+DVB_PLATFORM_DRIVERS all=y
+#- file drivers/media/platform/sti/c8sectpfe/Kconfig goes here
 
 #-
 #- *** FILE: drivers/media/platform/marvell-ccic/Kconfig ***
@@ -3488,6 +3574,8 @@ HTC_PASIC3 all=m
 MFD_INTEL_QUARK_I2C_GPIO all=m
 LPC_ICH all=m
 LPC_SCH all=m
+MFD_INTEL_LPSS_ACPI all=m
+MFD_INTEL_LPSS_PCI all=m
 MFD_JANZ_CMODIO all=m
 MFD_KEMPLD all=m
 MFD_MT6397 all=m
@@ -3534,6 +3622,7 @@ MFD_ARIZONA_SPI all=m
 MFD_WM5102 all=y
 MFD_WM5110 all=y
 MFD_WM8997 all=y
+MFD_WM8998 all=y
 MFD_WM831X all=y
 MFD_WM831X_SPI all=y
 MFD_WM8350_I2C all=y
@@ -3641,7 +3730,7 @@ SENSORS_LIS3_I2C all=m
 #- *** FILE: drivers/misc/mei/Kconfig ***
 #-
 INTEL_MEI all=m
-INTEL_MEI_ME all=y
+INTEL_MEI_ME all=m
 INTEL_MEI_TXE all=m
 
 #-
@@ -3657,6 +3746,8 @@ INTEL_MIC_HOST all=m
 INTEL_MIC_CARD all=m
 #- SCIF Driver
 SCIF all=m
+#- Intel MIC Coprocessor State Management (COSM) Drivers
+MIC_COSM all=m
 
 #-
 #- *** FILE: drivers/misc/ti-st/Kconfig ***
@@ -3687,11 +3778,6 @@ MMC_BLOCK_BOUNCE all=y
 SDIO_UART all=m
 MMC_TEST all=n
 
-#-
-#- *** FILE: drivers/mmc/core/Kconfig ***
-#-
-MMC_CLKGATE all=n
-
 #-
 #- *** FILE: drivers/mmc/host/Kconfig ***
 #-
@@ -3918,6 +4004,7 @@ TUN_VNET_CROSS_LE all=n
 VETH all=m
 VIRTIO_NET all=m
 NLMON all=m
+NET_VRF all=m
 #- file drivers/net/arcnet/Kconfig goes here
 #- file drivers/atm/Kconfig goes here
 #- file drivers/net/caif/Kconfig goes here
@@ -3939,6 +4026,7 @@ NET_SB1000 all=m
 XEN_NETDEV_FRONTEND all=m
 XEN_NETDEV_BACKEND all=m
 VMXNET3 all=m
+FUJITSU_ES all=m
 #- file drivers/net/hyperv/Kconfig goes here
 
 #-
@@ -4102,6 +4190,7 @@ WD80x3 alpha=m i386=m
 #- file drivers/net/ethernet/apple/Kconfig goes here
 #- file drivers/net/ethernet/arc/Kconfig goes here
 #- file drivers/net/ethernet/atheros/Kconfig goes here
+#- file drivers/net/ethernet/aurora/Kconfig goes here
 #- file drivers/net/ethernet/cadence/Kconfig goes here
 #- file drivers/net/ethernet/adi/Kconfig goes here
 #- file drivers/net/ethernet/broadcom/Kconfig goes here
@@ -4128,7 +4217,6 @@ DNET all=m
 #- file drivers/net/ethernet/intel/Kconfig goes here
 #- file drivers/net/ethernet/i825xx/Kconfig goes here
 #- file drivers/net/ethernet/xscale/Kconfig goes here
-#- file drivers/net/ethernet/icplus/Kconfig goes here
 JME all=m
 #- file drivers/net/ethernet/marvell/Kconfig goes here
 #- file drivers/net/ethernet/mellanox/Kconfig goes here
@@ -4162,6 +4250,7 @@ ETHOC all=m
 #- file drivers/net/ethernet/smsc/Kconfig goes here
 #- file drivers/net/ethernet/stmicro/Kconfig goes here
 #- file drivers/net/ethernet/sun/Kconfig goes here
+#- file drivers/net/ethernet/synopsys/Kconfig goes here
 #- file drivers/net/ethernet/tehuti/Kconfig goes here
 #- file drivers/net/ethernet/ti/Kconfig goes here
 #- file drivers/net/ethernet/tile/Kconfig goes here
@@ -4236,6 +4325,12 @@ ATL1E all=m
 ATL1C all=m
 ALX all=m
 
+#-
+#- *** FILE: drivers/net/ethernet/aurora/Kconfig ***
+#-
+NET_VENDOR_AURORA all=y
+AURORA_NB8800 all=m
+
 #-
 #- *** FILE: drivers/net/ethernet/broadcom/Kconfig ***
 #-
@@ -4246,6 +4341,9 @@ CNIC all=m
 TIGON3 all=m
 BNX2X all=m
 BNX2X_SRIOV all=y
+BNX2X_VXLAN all=y
+BNXT all=m
+BNXT_SRIOV all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/brocade/Kconfig ***
@@ -4272,9 +4370,10 @@ NET_CALXEDA_XGMAC all=m
 #-
 #- *** FILE: drivers/net/ethernet/cavium/Kconfig ***
 #-
-NET_VENDOR_CAVIUM all=m
+NET_VENDOR_CAVIUM all=y
 THUNDER_NIC_PF all=m
 THUNDER_NIC_VF all=m
+THUNDER_NIC_BGX all=m
 LIQUIDIO all=m
 
 #-
@@ -4384,11 +4483,6 @@ NET_VENDOR_I825XX all=y
 IBMVETH ppc64=m
 #- file drivers/net/ethernet/ibm/emac/Kconfig goes here
 
-#-
-#- *** FILE: drivers/net/ethernet/icplus/Kconfig ***
-#-
-IP1000 all=m
-
 #-
 #- *** FILE: drivers/net/ethernet/intel/Kconfig ***
 #-
@@ -4441,6 +4535,14 @@ MLX4_CORE all=m
 MLX5_CORE all=m
 MLX5_CORE_EN all=y
 
+#-
+#- *** FILE: drivers/net/ethernet/mellanox/mlxsw/Kconfig ***
+#-
+MLXSW_CORE all=m
+MLXSW_PCI all=m
+MLXSW_SWITCHX2 all=m
+MLXSW_SPECTRUM all=m
+
 #-
 #- *** FILE: drivers/net/ethernet/micrel/Kconfig ***
 #-
@@ -4456,6 +4558,7 @@ KSZ884X_PCI all=m
 NET_VENDOR_MICROCHIP all=y
 ENC28J60 all=m
 ENC28J60_WRITEVERIFY all=n
+ENCX24J600 all=m
 
 #-
 #- *** FILE: drivers/net/ethernet/myricom/Kconfig ***
@@ -4520,6 +4623,8 @@ QLCNIC_VXLAN all=y
 QLCNIC_HWMON all=y
 QLGE all=m
 NETXEN_NIC all=m sparc=n
+QED all=m
+QEDE all=m
 
 #-
 #- *** FILE: drivers/net/ethernet/qualcomm/Kconfig ***
@@ -4625,6 +4730,11 @@ CASSINI all=m sparc=n
 SUNVNET sparc64=m
 NIU all=m
 
+#-
+#- *** FILE: drivers/net/ethernet/synopsys/Kconfig ***
+#-
+NET_VENDOR_SYNOPSYS all=y
+
 #-
 #- *** FILE: drivers/net/ethernet/tehuti/Kconfig ***
 #-
@@ -4716,6 +4826,7 @@ HYPERV_NET all=m
 IEEE802154_DRIVERS all=m
 IEEE802154_FAKELB all=m
 IEEE802154_AT86RF230 all=m
+IEEE802154_AT86RF230_DEBUGFS all=n
 IEEE802154_MRF24J40 all=m
 IEEE802154_CC2520 all=m
 IEEE802154_ATUSB all=m
@@ -4757,6 +4868,7 @@ MCS_FIR all=m
 #-
 PHYLIB all=y
 #- MII PHY device drivers
+AQUANTIA_PHY all=m
 AT803X_PHY all=m
 AMD_PHY all=m
 MARVELL_PHY all=m
@@ -4765,6 +4877,7 @@ QSEMI_PHY all=m
 LXT_PHY all=m
 CICADA_PHY all=m
 VITESSE_PHY all=m
+TERANETICS_PHY all=m
 SMSC_PHY all=m
 BROADCOM_PHY all=m
 BCM63XX_PHY all=m
@@ -4776,10 +4889,13 @@ NATIONAL_PHY all=m
 STE10XP all=m
 LSI_ET1011C_PHY all=m
 MICREL_PHY all=m
+DP83848_PHY all=m
 DP83867_PHY all=m
+MICROCHIP_PHY all=m
 FIXED_PHY all=y
 MDIO_BITBANG all=m
 MDIO_GPIO all=m
+MDIO_OCTEON all=m
 MDIO_BCM_UNIMAC all=m
 MICREL_KS8995MA all=m
 
@@ -4832,6 +4948,7 @@ USB_KAWETH all=m
 USB_PEGASUS all=m
 USB_RTL8150 all=m
 USB_RTL8152 all=m
+USB_LAN78XX all=m
 USB_USBNET all=m
 USB_NET_AX8817X all=m
 USB_NET_AX88179_178A all=m
@@ -4867,6 +4984,7 @@ USB_CDC_PHONET all=m
 USB_IPHETH all=m
 USB_SIERRA_NET all=m
 USB_VL600 all=m
+USB_NET_CH9200 all=m
 
 #-
 #- *** FILE: drivers/net/wan/Kconfig ***
@@ -4926,8 +5044,8 @@ PCMCIA_WL3501 all=m
 PRISM54 all=m
 USB_ZD1201 all=m
 USB_NET_RNDIS_WLAN all=m
-#- file drivers/net/wireless/rtl818x/Kconfig goes here
 ADM8211 all=m
+#- file drivers/net/wireless/realtek/rtl818x/Kconfig goes here
 MAC80211_HWSIM all=m
 MWL8K all=m
 #- file drivers/net/wireless/ath/Kconfig goes here
@@ -4943,7 +5061,8 @@ MWL8K all=m
 #- file drivers/net/wireless/p54/Kconfig goes here
 #- file drivers/net/wireless/rt2x00/Kconfig goes here
 #- file drivers/net/wireless/mediatek/Kconfig goes here
-#- file drivers/net/wireless/rtlwifi/Kconfig goes here
+#- file drivers/net/wireless/realtek/rtlwifi/Kconfig goes here
+#- file drivers/net/wireless/realtek/rtl8xxxu/Kconfig goes here
 #- file drivers/net/wireless/ti/Kconfig goes here
 #- file drivers/net/wireless/zd1211rw/Kconfig goes here
 #- file drivers/net/wireless/mwifiex/Kconfig goes here
@@ -5038,7 +5157,6 @@ B43_BCMA all=y
 B43_BUSES_BCMA_AND_SSB all=y
 B43_BUSES_BCMA all=n
 B43_BUSES_SSB all=n
-B43_PCMCIA all=y
 B43_SDIO all=y
 B43_PHY_G all=y
 B43_PHY_N all=y
@@ -5172,6 +5290,35 @@ P54_PCI all=m
 P54_SPI all=m
 P54_SPI_DEFAULT_EEPROM all=y
 
+#-
+#- *** FILE: drivers/net/wireless/realtek/rtl818x/Kconfig ***
+#-
+RTL8180 all=m
+RTL8187 all=m
+
+#-
+#- *** FILE: drivers/net/wireless/realtek/rtl8xxxu/Kconfig ***
+#-
+RTL8XXXU all=m
+RTL8XXXU_UNTESTED all=y
+
+#-
+#- *** FILE: drivers/net/wireless/realtek/rtlwifi/Kconfig ***
+#-
+RTL_CARDS all=m
+RTL8192CE all=m
+RTL8192SE all=m
+RTL8192DE all=m
+RTL8723AE all=m
+RTL8723BE all=m
+RTL8188EE all=m
+RTL8192EE all=m
+RTL8821AE all=m
+RTL8192CU all=m
+RTLWIFI all=m
+RTLWIFI_DEBUG all=n
+RTL8192C_COMMON all=m
+
 #-
 #- *** FILE: drivers/net/wireless/rsi/Kconfig ***
 #-
@@ -5203,29 +5350,6 @@ RT2800USB_RT55XX all=y
 RT2800USB_UNKNOWN all=y
 RT2X00_DEBUG all=n
 
-#-
-#- *** FILE: drivers/net/wireless/rtl818x/Kconfig ***
-#-
-RTL8180 all=m
-RTL8187 all=m
-
-#-
-#- *** FILE: drivers/net/wireless/rtlwifi/Kconfig ***
-#-
-RTL_CARDS all=m
-RTL8192CE all=m
-RTL8192SE all=m
-RTL8192DE all=m
-RTL8723AE all=m
-RTL8723BE all=m
-RTL8188EE all=m
-RTL8192EE all=m
-RTL8821AE all=m
-RTL8192CU all=m
-RTLWIFI all=m
-RTLWIFI_DEBUG all=n
-RTL8192C_COMMON all=m
-
 #-
 #- *** FILE: drivers/net/wireless/ti/Kconfig ***
 #-
@@ -5274,12 +5398,20 @@ NFC_TRF7970A all=m
 NFC_MEI_PHY all=m
 NFC_SIM all=m
 NFC_PORT100 all=m
+#- file drivers/nfc/fdp/Kconfig goes here
 #- file drivers/nfc/pn544/Kconfig goes here
 #- file drivers/nfc/microread/Kconfig goes here
 #- file drivers/nfc/nfcmrvl/Kconfig goes here
 #- file drivers/nfc/st21nfca/Kconfig goes here
 #- file drivers/nfc/st-nci/Kconfig goes here
 #- file drivers/nfc/nxp-nci/Kconfig goes here
+#- file drivers/nfc/s3fwrn5/Kconfig goes here
+
+#-
+#- *** FILE: drivers/nfc/fdp/Kconfig ***
+#-
+NFC_FDP all=m
+NFC_FDP_I2C all=m
 
 #-
 #- *** FILE: drivers/nfc/microread/Kconfig ***
@@ -5294,6 +5426,8 @@ NFC_MICROREAD_MEI all=m
 NFC_MRVL all=m
 NFC_MRVL_USB all=m
 NFC_MRVL_UART all=m
+NFC_MRVL_I2C all=m
+NFC_MRVL_SPI all=m
 
 #-
 #- *** FILE: drivers/nfc/nxp-nci/Kconfig ***
@@ -5308,11 +5442,17 @@ NFC_PN544 all=m
 NFC_PN544_I2C all=m
 NFC_PN544_MEI all=m
 
+#-
+#- *** FILE: drivers/nfc/s3fwrn5/Kconfig ***
+#-
+NFC_S3FWRN5_I2C all=m
+
 #-
 #- *** FILE: drivers/nfc/st-nci/Kconfig ***
 #-
 NFC_ST_NCI all=m
 NFC_ST_NCI_I2C all=m
+NFC_ST_NCI_SPI all=m
 
 #-
 #- *** FILE: drivers/nfc/st21nfca/Kconfig ***
@@ -5346,6 +5486,16 @@ BLK_DEV_PMEM all=m
 ND_BLK all=m
 BTT all=y
 
+#-
+#- *** FILE: drivers/nvme/host/Kconfig ***
+#-
+BLK_DEV_NVME all=m
+
+#-
+#- *** FILE: drivers/nvmem/Kconfig ***
+#-
+NVMEM all=m
+
 #-
 #- *** FILE: drivers/of/Kconfig ***
 #-
@@ -5485,6 +5635,7 @@ PINCTRL_AMD all=y
 #- file drivers/pinctrl/sh-pfc/Kconfig goes here
 #- file drivers/pinctrl/spear/Kconfig goes here
 #- file drivers/pinctrl/sunxi/Kconfig goes here
+#- file drivers/pinctrl/uniphier/Kconfig goes here
 #- file drivers/pinctrl/vt8500/Kconfig goes here
 #- file drivers/pinctrl/mediatek/Kconfig goes here
 
@@ -5493,6 +5644,7 @@ PINCTRL_AMD all=y
 #-
 PINCTRL_BAYTRAIL all=y
 PINCTRL_CHERRYVIEW all=m
+PINCTRL_BROXTON all=m
 PINCTRL_SUNRISEPOINT all=m
 
 #-
@@ -5550,6 +5702,7 @@ TOPSTAR_LAPTOP all=m
 ACPI_TOSHIBA i386=m x86_64=m
 TOSHIBA_BT_RFKILL all=m
 TOSHIBA_HAPS all=m
+TOSHIBA_WMI all=m
 ACPI_CMPC all=m
 INTEL_SCU_IPC i386=y
 GPIO_INTEL_PMIC i386=y
@@ -5565,6 +5718,7 @@ INTEL_RST all=m
 INTEL_SMARTCONNECT all=m
 PVPANIC all=m
 INTEL_PMC_IPC all=m
+SURFACE_PRO3_BUTTON all=m
 
 #-
 #- *** FILE: drivers/pnp/Kconfig ***
@@ -5611,9 +5765,9 @@ BATTERY_DS2781 all=m
 BATTERY_DS2782 all=m
 BATTERY_PMU ppc=m
 BATTERY_SBS all=m
-BATTERY_BQ27x00 all=m
-BATTERY_BQ27X00_I2C all=y
-BATTERY_BQ27X00_PLATFORM all=y
+BATTERY_BQ27XXX all=m
+BATTERY_BQ27XXX_I2C all=y
+BATTERY_BQ27XXX_PLATFORM all=y
 BATTERY_DA9030 all=m
 BATTERY_DA9052 all=m
 BATTERY_MAX17040 all=m
@@ -5631,6 +5785,7 @@ CHARGER_BQ24257 all=m
 CHARGER_BQ24735 all=m
 CHARGER_BQ25890 all=m
 CHARGER_SMB347 all=m
+CHARGER_TPS65217 all=m
 BATTERY_GAUGE_LTC2941 all=m
 AB8500_BM all=n
 BATTERY_GOLDFISH all=m
@@ -5687,6 +5842,7 @@ PWM_LP3943 all=m
 PWM_LPSS all=m
 PWM_LPSS_PCI all=m
 PWM_LPSS_PLATFORM all=m
+PWM_PCA9685 all=m
 
 #-
 #- *** FILE: drivers/rapidio/Kconfig ***
@@ -5747,6 +5903,7 @@ REGULATOR_MAX8952 all=m
 REGULATOR_MAX8973 all=m
 REGULATOR_MC13783 all=m
 REGULATOR_MC13892 all=m
+REGULATOR_MT6311 all=m
 REGULATOR_MT6397 all=m
 REGULATOR_PCAP all=m
 REGULATOR_PCF50633 all=m
@@ -5813,6 +5970,7 @@ RTC_DRV_ISL12057 all=m
 RTC_DRV_X1205 all=m
 RTC_DRV_PCF2127 all=m
 RTC_DRV_PCF8523 all=m
+RTC_DRV_PCF85363 all=m
 RTC_DRV_PCF8563 all=m
 RTC_DRV_PCF85063 all=m
 RTC_DRV_PCF8583 all=m sparc=n
@@ -5826,6 +5984,7 @@ RTC_DRV_RX8581 all=m
 RTC_DRV_RX8025 all=m
 RTC_DRV_EM3027 all=m
 RTC_DRV_RV3029C2 all=m
+RTC_DRV_RV8803 all=m
 #- SPI RTC drivers
 RTC_DRV_M41T93 all=m
 RTC_DRV_M41T94 all=m
@@ -5925,6 +6084,7 @@ ISCSI_TCP all=m
 #- file drivers/scsi/bnx2i/Kconfig goes here
 #- file drivers/scsi/bnx2fc/Kconfig goes here
 #- file drivers/scsi/be2iscsi/Kconfig goes here
+#- file drivers/scsi/cxlflash/Kconfig goes here
 BLK_DEV_3W_XXXX_RAID all=m
 SCSI_HPSA all=m
 SCSI_3W_9XXX all=m
@@ -5946,7 +6106,6 @@ SCSI_IN2000 alpha=m i386=m
 SCSI_ARCMSR all=m sparc=n
 #- file drivers/scsi/esas2r/Kconfig goes here
 #- file drivers/scsi/megaraid/Kconfig.megaraid goes here
-#- file drivers/scsi/mpt2sas/Kconfig goes here
 #- file drivers/scsi/mpt3sas/Kconfig goes here
 #- file drivers/scsi/ufs/Kconfig goes here
 SCSI_HPTIOP all=m sparc=n
@@ -6093,7 +6252,7 @@ SCSI_CXGB4_ISCSI all=m
 #-
 #- *** FILE: drivers/scsi/device_handler/Kconfig ***
 #-
-SCSI_DH all=m
+SCSI_DH all=y
 SCSI_DH_RDAC all=m
 SCSI_DH_HP_SW all=m
 SCSI_DH_EMC all=m
@@ -6120,19 +6279,13 @@ MEGARAID_MAILBOX all=m
 MEGARAID_LEGACY all=m
 MEGARAID_SAS all=m
 
-#-
-#- *** FILE: drivers/scsi/mpt2sas/Kconfig ***
-#-
-SCSI_MPT2SAS all=m
-SCSI_MPT2SAS_MAX_SGE all=128
-SCSI_MPT2SAS_LOGGING all=y
-
 #-
 #- *** FILE: drivers/scsi/mpt3sas/Kconfig ***
 #-
 SCSI_MPT3SAS all=m
+SCSI_MPT2SAS_MAX_SGE all=128
 SCSI_MPT3SAS_MAX_SGE all=128
-SCSI_MPT3SAS_LOGGING all=y
+SCSI_MPT2SAS all=m
 
 #-
 #- *** FILE: drivers/scsi/mvsas/Kconfig ***
@@ -6234,6 +6387,7 @@ SPMI all=m
 SSB all=m
 SSB_PCMCIAHOST all=y
 SSB_SDIOHOST sparc=y
+SSB_HOST_SOC all=y
 SSB_SILENT all=n
 SSB_DEBUG all=n
 SSB_DRIVER_GPIO all=y
@@ -6258,18 +6412,16 @@ STAGING all=y
 #- 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/ft1000/Kconfig goes here
 #- file drivers/staging/speakup/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
+#- file drivers/staging/rdma/Kconfig goes here
 #- file drivers/staging/android/Kconfig goes here
 #- file drivers/staging/board/Kconfig goes here
-#- file drivers/staging/ozwpan/Kconfig goes here
 #- file drivers/staging/gdm72xx/Kconfig goes here
 #- file drivers/staging/gdm724x/Kconfig goes here
 #- file drivers/staging/fwserial/Kconfig goes here
@@ -6286,6 +6438,7 @@ STAGING all=y
 #- file drivers/staging/fbtft/Kconfig goes here
 #- file drivers/staging/fsl-mc/Kconfig goes here
 #- file drivers/staging/wilc1000/Kconfig goes here
+#- file drivers/staging/most/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
@@ -6323,7 +6476,6 @@ COMEDI_DT2815 all=m
 COMEDI_DT2817 all=m
 COMEDI_DT282X all=m
 COMEDI_DMM32AT all=m
-COMEDI_UNIOXX5 all=m
 COMEDI_FL512 all=m
 COMEDI_AIO_AIO12_8 all=m
 COMEDI_AIO_IIRO_16 all=m
@@ -6453,21 +6605,16 @@ FB_TFT_SSD1306 all=m
 FB_TFT_SSD1331 all=m
 FB_TFT_SSD1351 all=m
 FB_TFT_ST7735R all=m
+FB_TFT_ST7789V all=m
 FB_TFT_TINYLCD all=m
 FB_TFT_TLS8204 all=m
+FB_TFT_UC1611 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 ***
-#-
-FT1000 all=m
-FT1000_USB all=m
-FT1000_PCMCIA all=m
-
 #-
 #- *** FILE: drivers/staging/fwserial/Kconfig ***
 #-
@@ -6668,15 +6815,58 @@ DVB_MN88472 all=m
 DVB_MN88473 all=m
 
 #-
-#- *** FILE: drivers/staging/mt29f_spinand/Kconfig ***
+#- *** FILE: drivers/staging/most/Kconfig ***
 #-
-MTD_SPINAND_MT29F all=m
-MTD_SPINAND_ONDIEECC all=y
+MOST all=m
+#- file drivers/staging/most/mostcore/Kconfig goes here
+#- file drivers/staging/most/aim-cdev/Kconfig goes here
+#- file drivers/staging/most/aim-network/Kconfig goes here
+#- file drivers/staging/most/aim-sound/Kconfig goes here
+#- file drivers/staging/most/aim-v4l2/Kconfig goes here
+#- file drivers/staging/most/hdm-dim2/Kconfig goes here
+#- file drivers/staging/most/hdm-i2c/Kconfig goes here
+#- file drivers/staging/most/hdm-usb/Kconfig goes here
 
 #-
-#- *** FILE: drivers/staging/ozwpan/Kconfig ***
+#- *** FILE: drivers/staging/most/aim-cdev/Kconfig ***
 #-
-USB_WPAN_HCD all=m
+AIM_CDEV all=m
+
+#-
+#- *** FILE: drivers/staging/most/aim-network/Kconfig ***
+#-
+AIM_NETWORK all=m
+
+#-
+#- *** FILE: drivers/staging/most/aim-sound/Kconfig ***
+#-
+AIM_SOUND all=m
+
+#-
+#- *** FILE: drivers/staging/most/aim-v4l2/Kconfig ***
+#-
+AIM_V4L2 all=m
+
+#-
+#- *** FILE: drivers/staging/most/hdm-dim2/Kconfig ***
+#-
+HDM_DIM2 all=m
+
+#-
+#- *** FILE: drivers/staging/most/hdm-i2c/Kconfig ***
+#-
+HDM_I2C all=m
+
+#-
+#- *** FILE: drivers/staging/most/hdm-usb/Kconfig ***
+#-
+HDM_USB all=m
+
+#-
+#- *** FILE: drivers/staging/mt29f_spinand/Kconfig ***
+#-
+MTD_SPINAND_MT29F all=m
+MTD_SPINAND_ONDIEECC all=y
 
 #-
 #- *** FILE: drivers/staging/panel/Kconfig ***
@@ -6686,6 +6876,35 @@ PANEL_PARPORT all=0
 PANEL_PROFILE all=5
 PANEL_CHANGE_MESSAGE all=n
 
+#-
+#- *** FILE: drivers/staging/rdma/Kconfig ***
+#-
+STAGING_RDMA all=y
+#- file drivers/staging/rdma/amso1100/Kconfig goes here
+#- file drivers/staging/rdma/ehca/Kconfig goes here
+#- file drivers/staging/rdma/hfi1/Kconfig goes here
+#- file drivers/staging/rdma/ipath/Kconfig goes here
+
+#-
+#- *** FILE: drivers/staging/rdma/amso1100/Kconfig ***
+#-
+INFINIBAND_AMSO1100 all=m sparc=
+INFINIBAND_AMSO1100_DEBUG all=n sparc=
+
+#-
+#- *** FILE: drivers/staging/rdma/hfi1/Kconfig ***
+#-
+INFINIBAND_HFI1 all=m
+HFI1_DEBUG_SDMA_ORDER all=n
+HFI1_VERBS_31BIT_PSN all=y
+SDMA_VERBOSITY all=n
+PRESCAN_RXQ all=y
+
+#-
+#- *** FILE: drivers/staging/rdma/ipath/Kconfig ***
+#-
+INFINIBAND_IPATH all=m
+
 #-
 #- *** FILE: drivers/staging/rtl8188eu/Kconfig ***
 #-
@@ -6743,11 +6962,6 @@ SLICOSS all=m
 #-
 FB_SM750 all=m
 
-#-
-#- *** FILE: drivers/staging/sm7xxfb/Kconfig ***
-#-
-FB_SM7XX all=m
-
 #-
 #- *** FILE: drivers/staging/speakup/Kconfig ***
 #-
@@ -6779,12 +6993,24 @@ TOUCHSCREEN_SYNAPTICS_I2C_RMI4 all=m
 UNISYSSPAR all=y
 #- file drivers/staging/unisys/visorbus/Kconfig goes here
 #- file drivers/staging/unisys/visornic/Kconfig goes here
+#- file drivers/staging/unisys/visorinput/Kconfig goes here
+#- file drivers/staging/unisys/visorhba/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/unisys/visorbus/Kconfig ***
 #-
 UNISYS_VISORBUS all=m
 
+#-
+#- *** FILE: drivers/staging/unisys/visorhba/Kconfig ***
+#-
+UNISYS_VISORHBA all=m
+
+#-
+#- *** FILE: drivers/staging/unisys/visorinput/Kconfig ***
+#-
+UNISYS_VISORINPUT all=m
+
 #-
 #- *** FILE: drivers/staging/unisys/visornic/Kconfig ***
 #-
@@ -6807,6 +7033,16 @@ VT6655 all=m
 #-
 VT6656 all=m
 
+#-
+#- *** FILE: drivers/staging/wilc1000/Kconfig ***
+#-
+WILC1000_DRIVER all=n
+WILC1000_PREALLOCATE_AT_LOADING_DRIVER all=y
+WILC1000_DYNAMICALLY_ALLOCATE_MEMROY all=n
+WILC1000_SDIO all=y
+WILC1000_SPI all=n
+WILC1000_HW_OOB_INTR all=y
+
 #-
 #- *** FILE: drivers/staging/wlan-ng/Kconfig ***
 #-
@@ -6870,6 +7106,7 @@ X86_PKG_TEMP_THERMAL all=m
 INTEL_SOC_DTS_THERMAL all=m
 INTEL_QUARK_DTS_THERMAL i386=m
 INT340X_THERMAL all=m
+INTEL_PCH_THERMAL all=m
 #- file drivers/thermal/ti-soc-thermal/Kconfig goes here
 #- file drivers/thermal/samsung/Kconfig goes here
 #- file drivers/thermal/st/Kconfig goes here
@@ -6906,6 +7143,7 @@ N_HDLC all=m
 N_GSM all=m
 TRACE_ROUTER all=m
 TRACE_SINK all=m
+LDISC_AUTOLOAD all=y
 
 #-
 #- *** FILE: drivers/tty/hvc/Kconfig ***
@@ -6926,6 +7164,7 @@ SERIAL_8250_DEPRECATED_OPTIONS all=y
 SERIAL_8250_PNP all=y
 SERIAL_8250_CONSOLE all=y
 SERIAL_8250_PCI all=y
+SERIAL_8250_EXAR all=y
 SERIAL_8250_CS all=m
 SERIAL_8250_NR_UARTS all=8
 SERIAL_8250_RUNTIME_UARTS all=4
@@ -6940,7 +7179,9 @@ SERIAL_8250_SHARE_IRQ all=y
 SERIAL_8250_DETECT_IRQ all=y
 SERIAL_8250_RSA all=y
 SERIAL_8250_DW all=m
+SERIAL_8250_RT288X all=y
 SERIAL_8250_FINTEK all=m
+SERIAL_8250_MID all=m
 
 #-
 #- *** FILE: drivers/tty/serial/Kconfig ***
@@ -7102,8 +7343,6 @@ USB_DWC3_OMAP all=m
 USB_DWC3_EXYNOS all=m
 USB_DWC3_PCI all=m
 USB_DWC3_KEYSTONE all=m
-#- Debugging features
-USB_DWC3_DEBUG all=n
 
 #-
 #- *** FILE: drivers/usb/gadget/Kconfig ***
@@ -7214,7 +7453,6 @@ USB_EHCI_MV all=y
 USB_OXU210HP_HCD all=m
 USB_ISP116X_HCD all=m
 USB_ISP1362_HCD all=m
-USB_FUSBH200_HCD all=m
 USB_FOTG210_HCD all=m
 USB_MAX3421_HCD all=m
 USB_OHCI_HCD all=m
@@ -7260,7 +7498,6 @@ USB_EMI62 all=m
 USB_EMI26 all=m
 USB_ADUTUX all=m
 USB_SEVSEG all=m
-USB_RIO500 all=m
 USB_LEGOTOWER all=m
 USB_LCD all=m
 USB_LED all=m
@@ -7298,6 +7535,7 @@ USB_MON all=m
 #-
 USB_MUSB_HDRC all=n
 #- Platform Glue Layer
+#- MUSB DMA mode
 
 #-
 #- *** FILE: drivers/usb/phy/Kconfig ***
@@ -7439,6 +7677,7 @@ UWB_I1480U all=m
 VFIO all=m
 #- file drivers/vfio/pci/Kconfig goes here
 #- file drivers/vfio/platform/Kconfig goes here
+#- file virt/lib/Kconfig goes here
 
 #-
 #- *** FILE: drivers/vfio/pci/Kconfig ***
@@ -7495,6 +7734,7 @@ BACKLIGHT_PWM all=m
 BACKLIGHT_DA903X all=m
 BACKLIGHT_DA9052 all=m
 BACKLIGHT_APPLE all=m
+BACKLIGHT_PM8941_WLED all=m
 BACKLIGHT_SAHARA all=m
 BACKLIGHT_WM831X all=m
 BACKLIGHT_ADP8860 all=m
@@ -7514,8 +7754,6 @@ BACKLIGHT_BD6107 all=m
 #- *** FILE: drivers/video/console/Kconfig ***
 #-
 VGA_CONSOLE all=y
-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
@@ -7638,7 +7876,7 @@ FB_TMIO_ACCELL all=y
 FB_SM501 all=m
 FB_SMSCUFX all=m
 FB_UDL all=m
-FB_IBM_GXT4500 ppc=m ppc64=m
+FB_IBM_GXT4500 all=m
 FB_PS3 ppc64=y
 FB_PS3_DEFAULT_SIZE_M ppc64=18
 FB_GOLDFISH all=m
@@ -7658,6 +7896,7 @@ FB_SIMPLE all=y
 #- file drivers/video/fbdev/omap2/Kconfig goes here
 #- file drivers/video/fbdev/exynos/Kconfig goes here
 #- file drivers/video/fbdev/mmp/Kconfig goes here
+FB_SM712 all=m
 
 #-
 #- *** FILE: drivers/video/fbdev/exynos/Kconfig ***
@@ -7762,6 +8001,7 @@ W1_SLAVE_BQ27000 all=m
 WATCHDOG all=y
 WATCHDOG_CORE all=y
 WATCHDOG_NOWAYOUT all=n
+WATCHDOG_HANDLE_BOOT_ENABLED all=y
 #- Watchdog Device Drivers
 SOFT_WATCHDOG all=m
 DA9052_WATCHDOG all=m
@@ -7813,6 +8053,7 @@ W83877F_WDT i386=m x86_64=m
 W83977F_WDT i386=m x86_64=m
 MACHZ_WDT i386=m x86_64=m
 SBC_EPX_C3_WATCHDOG i386=m x86_64=m
+BCM7038_WDT all=m
 MPC5200_WDT ppc=m
 MEN_A21_WDT all=m
 WATCHDOG_RTAS ppc=m ppc64=m
@@ -7835,7 +8076,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_BALLOON_MEMORY_HOTPLUG_LIMIT x86_64=512 x86=4
 XEN_SCRUB_PAGES all=y
 XEN_DEV_EVTCHN all=m
 XEN_BACKEND all=y
@@ -7848,6 +8089,7 @@ XEN_PCIDEV_BACKEND all=m
 XEN_SCSI_BACKEND all=m
 XEN_ACPI_PROCESSOR all=m
 XEN_MCE_LOG all=y
+XEN_SYMS all=y
 
 #-
 #- *** FILE: fs/9p/Kconfig ***
@@ -7861,9 +8103,7 @@ XEN_MCE_LOG all=y
 #- *** FILE: fs/Kconfig ***
 #-
 #- file fs/ext2/Kconfig goes here
-#- file fs/ext3/Kconfig goes here
 #- file fs/ext4/Kconfig goes here
-#- file fs/jbd/Kconfig goes here
 #- file fs/jbd2/Kconfig goes here
 FS_MBCACHE all=m
 #- file fs/reiserfs/Kconfig goes here
@@ -8084,19 +8324,13 @@ EXT2_FS_POSIX_ACL all=y
 EXT2_FS_SECURITY all=y
 
 #-
-#- *** FILE: fs/ext3/Kconfig ***
+#- *** FILE: fs/ext4/Kconfig ***
 #-
 EXT3_FS all=n
-EXT3_DEFAULTS_TO_ORDERED all=n
-EXT3_FS_XATTR all=y
 EXT3_FS_POSIX_ACL all=y
 EXT3_FS_SECURITY all=y
-
-#-
-#- *** FILE: fs/ext4/Kconfig ***
-#-
 EXT4_FS all=m
-EXT4_USE_FOR_EXT23 all=y
+EXT4_USE_FOR_EXT2 all=y
 EXT4_FS_POSIX_ACL all=y
 EXT4_FS_SECURITY all=y
 EXT4_ENCRYPTION all=m
@@ -8172,12 +8406,6 @@ ISO9660_FS all=m
 JOLIET all=y
 ZISOFS all=y
 
-#-
-#- *** FILE: fs/jbd/Kconfig ***
-#-
-JBD all=m
-JBD_DEBUG all=n
-
 #-
 #- *** FILE: fs/jbd2/Kconfig ***
 #-
@@ -8454,6 +8682,7 @@ UBIFS_FS all=m
 UBIFS_FS_ADVANCED_COMPR all=y
 UBIFS_FS_LZO all=y
 UBIFS_FS_ZLIB all=y
+UBIFS_ATIME_SUPPORT all=y
 
 #-
 #- *** FILE: fs/udf/Kconfig ***
@@ -8519,7 +8748,6 @@ TASK_IO_ACCOUNTING all=y
 TREE_RCU all=y
 RCU_EXPERT all=n
 TASKS_RCU all=n
-RCU_USER_QS all=n
 RCU_FANOUT all=32 alpha=64 ia64=64 ppc64=64 sparc64=64 x86_64=64
 RCU_FANOUT_LEAF all=16
 RCU_FAST_NO_HZ all=y
@@ -8537,6 +8765,7 @@ NUMA_BALANCING_DEFAULT_ENABLED all=y
 CGROUPS all=y
 CGROUP_DEBUG all=n
 CGROUP_FREEZER all=y
+CGROUP_PIDS all=y
 CGROUP_DEVICE all=y
 CPUSETS all=y
 PROC_PID_CPUSET all=n
@@ -8566,6 +8795,7 @@ SYSFS_DEPRECATED_V2 all=n
 RELAY all=y
 BLK_DEV_INITRD all=y
 #- file usr/Kconfig goes here
+CC_OPTIMIZE_FOR_PERFORMANCE all=y
 CC_OPTIMIZE_FOR_SIZE all=n
 SYSCTL all=y
 ANON_INODES all=y
@@ -8584,8 +8814,11 @@ SIGNALFD all=y
 TIMERFD all=y
 EVENTFD all=y
 BPF_SYSCALL all=y
+BPF_JIT_ALWAYS_ON all=y
 SHMEM all=y
 AIO all=y
+BPF_UNPRIV_DEFAULT_OFF all=y
+USERFAULTFD all=y
 PCI_QUIRKS all=y
 EMBEDDED all=n
 PERF_EVENTS all=y
@@ -8596,7 +8829,6 @@ SLAB all=n
 SLUB all=y
 SLOB all=n
 SLUB_CPU_PARTIAL all=y
-SYSTEM_TRUSTED_KEYRING all=y
 PROFILING all=y
 #- file arch/Kconfig goes here
 SLABINFO all=y
@@ -8613,7 +8845,6 @@ MODULE_SIG all=n
 MODULE_COMPRESS all=y
 MODULE_COMPRESS_GZIP all=n
 MODULE_COMPRESS_XZ all=y
-STOP_MACHINE all=y
 #- file block/Kconfig goes here
 #- file kernel/Kconfig.locks goes here
 
@@ -8710,6 +8941,7 @@ TRACEPOINT_BENCHMARK all=n
 RING_BUFFER_BENCHMARK all=m
 RING_BUFFER_STARTUP_TEST all=n
 TRACE_ENUM_MAP_FILE all=n
+TRACING_EVENTS_GPIO all=y
 
 #-
 #- *** FILE: lib/Kconfig ***
@@ -8775,6 +9007,7 @@ PAGE_OWNER all=n
 DEBUG_FS all=y
 HEADERS_CHECK all=y
 DEBUG_SECTION_MISMATCH all=n
+SECTION_MISMATCH_WARN_ONLY all=y
 FRAME_POINTER i386=y x86_64=y
 DEBUG_FORCE_WEAK_PER_CPU all=n
 MAGIC_SYSRQ all=y
@@ -8808,7 +9041,6 @@ SCHED_STACK_END_CHECK all=y
 DEBUG_TIMEKEEPING all=n
 TIMER_STATS all=y
 DEBUG_RT_MUTEXES all=n
-RT_MUTEX_TESTER all=n
 DEBUG_SPINLOCK all=n
 DEBUG_MUTEXES all=n
 DEBUG_WW_MUTEX_SLOWPATH all=n
@@ -8832,7 +9064,6 @@ RCU_TORTURE_TEST_SLOW_PREINIT all=n
 RCU_TORTURE_TEST_SLOW_INIT all=n
 RCU_TORTURE_TEST_SLOW_CLEANUP all=n
 RCU_CPU_STALL_TIMEOUT all=60
-RCU_CPU_STALL_INFO all=n
 RCU_TRACE all=n
 RCU_EQS_DEBUG all=n
 DEBUG_BLOCK_EXT_DEVT all=n
@@ -8854,7 +9085,9 @@ ASYNC_RAID6_TEST all=m
 TEST_HEXDUMP all=m
 TEST_STRING_HELPERS all=m
 TEST_KSTRTOX all=m
+TEST_PRINTF all=m
 TEST_RHASHTABLE all=n
+TEST_HASH all=n
 PROVIDE_OHCI1394_DMA_INIT all=n
 BUILD_DOCSRC all=n
 DMA_API_DEBUG all=n
@@ -8863,8 +9096,10 @@ TEST_USER_COPY all=n
 TEST_BPF all=n
 TEST_FIRMWARE all=m
 TEST_UDELAY all=m
+TEST_STATIC_KEYS all=m
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
+#- file lib/Kconfig.ubsan goes here
 
 #-
 #- *** FILE: lib/Kconfig.kasan ***
@@ -8889,6 +9124,11 @@ KDB_CONTINUE_CATASTROPHIC all=0
 #-
 KMEMCHECK all=n
 
+#-
+#- *** FILE: lib/Kconfig.ubsan ***
+#-
+UBSAN all=n
+
 #-
 #- *** FILE: lib/fonts/Kconfig ***
 #-
@@ -8951,13 +9191,15 @@ ZSMALLOC all=y
 PGTABLE_MAPPING all=n
 ZSMALLOC_STAT all=y
 DEFERRED_STRUCT_PAGE_INIT all=n
+IDLE_PAGE_TRACKING all=y
 
 #-
 #- *** FILE: mm/Kconfig.debug ***
 #-
 PAGE_EXTENSION all=n
 DEBUG_PAGEALLOC all=n
-PAGE_POISONING sparc=n ia64=n alpha=n
+PAGE_POISONING all=n
+PAGE_POISONING_ZERO all=n
 
 #-
 #- *** FILE: net/6lowpan/Kconfig ***
@@ -9040,6 +9282,7 @@ BRIDGE_NETFILTER all=m
 #- file net/mpls/Kconfig goes here
 #- file net/hsr/Kconfig goes here
 #- file net/switchdev/Kconfig goes here
+#- file net/l3mdev/Kconfig goes here
 RFS_ACCEL all=y
 CGROUP_NET_PRIO all=y
 BPF_JIT all=y
@@ -9104,6 +9347,7 @@ BT_BREDR all=y
 #- file net/bluetooth/bnep/Kconfig goes here
 #- file net/bluetooth/cmtp/Kconfig goes here
 #- file net/bluetooth/hidp/Kconfig goes here
+BT_HS all=y
 BT_LE all=y
 BT_6LOWPAN all=y
 BT_SELFTEST all=n
@@ -9250,6 +9494,7 @@ IEEE802154_6LOWPAN all=m
 #- *** FILE: net/ieee802154/Kconfig ***
 #-
 IEEE802154 all=m
+IEEE802154_NL802154_EXPERIMENTAL all=y
 IEEE802154_SOCKET all=m
 #- file net/ieee802154/6lowpan/Kconfig goes here
 
@@ -9279,7 +9524,6 @@ SYN_COOKIES all=y
 NET_IPVTI all=m
 NET_FOU all=m
 NET_FOU_IP_TUNNELS all=y
-GENEVE_CORE all=m
 INET_AH all=m
 INET_ESP all=m
 INET_IPCOMP all=m
@@ -9324,6 +9568,7 @@ NF_CONNTRACK_PROC_COMPAT all=y
 NF_TABLES_IPV4 all=m
 NFT_CHAIN_ROUTE_IPV4 all=m
 NFT_REJECT_IPV4 all=m
+NFT_DUP_IPV4 all=m
 NF_TABLES_ARP all=m
 NF_LOG_ARP all=m
 NF_LOG_IPV4 all=m
@@ -9366,6 +9611,7 @@ INET6_AH all=m
 INET6_ESP all=m
 INET6_IPCOMP all=m
 IPV6_MIP6 all=y
+IPV6_ILA all=m
 INET6_XFRM_TUNNEL all=m
 INET6_TUNNEL all=m
 INET6_XFRM_MODE_TRANSPORT all=m
@@ -9389,6 +9635,7 @@ IPV6_PIMSM_V2 all=y
 NF_CONNTRACK_IPV6 all=m
 NF_TABLES_IPV6 all=m
 NFT_CHAIN_ROUTE_IPV6 all=m
+NFT_DUP_IPV6 all=m
 NF_REJECT_IPV6 all=m
 NF_LOG_IPV6 all=m
 NF_NAT_IPV6 all=m
@@ -9461,6 +9708,11 @@ L2TP_V3 all=y
 L2TP_IP all=m
 L2TP_ETH all=m
 
+#-
+#- *** FILE: net/l3mdev/Kconfig ***
+#-
+NET_L3_MASTER_DEV all=y
+
 #-
 #- *** FILE: net/lapb/Kconfig ***
 #-
@@ -9497,6 +9749,7 @@ MAC802154 all=m
 #-
 NET_MPLS_GSO all=m
 MPLS_ROUTING all=m
+MPLS_IPTUNNEL all=m
 
 #-
 #- *** FILE: net/netfilter/Kconfig ***
@@ -9530,7 +9783,7 @@ NF_CONNTRACK_TFTP all=m
 NF_CT_NETLINK all=m
 NF_CT_NETLINK_TIMEOUT all=m
 NF_CT_NETLINK_HELPER all=m
-NETFILTER_NETLINK_QUEUE_CT all=y
+NETFILTER_NETLINK_GLUE_CT all=y
 NF_NAT all=m
 NF_NAT_REDIRECT all=m
 NF_TABLES all=m
@@ -9671,6 +9924,7 @@ IP_VS_WRR all=m
 IP_VS_LC all=m
 IP_VS_WLC all=m
 IP_VS_FO all=m
+IP_VS_OVF all=m
 IP_VS_LBLC all=m
 IP_VS_LBLCR all=m
 IP_VS_DH all=m
@@ -9690,7 +9944,6 @@ NETLABEL all=y
 #-
 #- *** FILE: net/netlink/Kconfig ***
 #-
-NETLINK_MMAP all=y
 NETLINK_DIAG all=m
 
 #-
@@ -9935,7 +10188,6 @@ DEFAULT_SECURITY_SELINUX all=n
 DEFAULT_SECURITY_SMACK all=n
 DEFAULT_SECURITY_TOMOYO all=n
 DEFAULT_SECURITY_APPARMOR=n
-DEFAULT_SECURITY_YAMA all=n
 DEFAULT_SECURITY_DAC all=y
 DEFAULT_SECURITY all=""
 
@@ -10010,7 +10262,6 @@ SECURITY_TOMOYO_ACTIVATION_TRIGGER all="/sbin/init"
 #- *** FILE: security/yama/Kconfig ***
 #-
 SECURITY_YAMA all=y
-SECURITY_YAMA_STACKED all=y
 
 #-
 #- *** FILE: sound/Kconfig ***
@@ -10101,9 +10352,10 @@ SND_OPL3_LIB all=m
 SND_OPL4_LIB alpha=m i386=m
 SND_VX_LIB all=m
 SND_AC97_CODEC all=m
-SND_DRIVERS all=n
+SND_DRIVERS all=y
 SND_PCSP all=m
 SND_DUMMY all=m
+SND_ALOOP all=m
 SND_VIRMIDI all=m
 SND_MTPAV all=m
 SND_MTS64 all=m
@@ -10124,6 +10376,8 @@ SND_ISIGHT all=m
 SND_SCS1X all=m
 SND_FIREWORKS all=m
 SND_BEBOB all=m
+SND_FIREWIRE_DIGI00X all=m
+SND_FIREWIRE_TASCAM all=m
 
 #-
 #- *** FILE: sound/hda/Kconfig ***
@@ -10360,6 +10614,8 @@ SND_SOC all=m
 #- file sound/soc/sh/Kconfig goes here
 #- file sound/soc/sirf/Kconfig goes here
 #- file sound/soc/spear/Kconfig goes here
+#- file sound/soc/sti/Kconfig goes here
+#- file sound/soc/sunxi/Kconfig goes here
 #- file sound/soc/tegra/Kconfig goes here
 #- file sound/soc/txx9/Kconfig goes here
 #- file sound/soc/ux500/Kconfig goes here
@@ -10381,6 +10637,7 @@ SND_SOC_AC97_CODEC all=m
 SND_SOC_ADAU1701 all=m
 SND_SOC_AK4104 all=m
 SND_SOC_AK4554 all=m
+SND_SOC_AK4613 all=m
 SND_SOC_AK4641 all=m
 SND_SOC_AK4642 all=m
 SND_SOC_AK5386 all=m
@@ -10397,8 +10654,9 @@ 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_CS4349 all=m
 SND_SOC_ES8328 all=m
+SND_SOC_GTM601 all=m
 SND_SOC_MAX98095 all=m
 SND_SOC_MAX9850 all=m
 SND_SOC_PCM1681 all=m
@@ -10417,6 +10675,7 @@ SND_SOC_SSM2602_I2C all=m
 SND_SOC_SSM4567 all=m
 SND_SOC_STA32X all=m
 SND_SOC_STA350 all=m
+SND_SOC_STI_SAS all=m
 SND_SOC_TAS2552 all=m
 SND_SOC_TAS5086 all=m
 SND_SOC_TAS571X all=m
@@ -10492,12 +10751,18 @@ 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
 SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH all=m
+SND_SOC_INTEL_SKL_RT286_MACH all=m
 
 #-
 #- *** FILE: sound/soc/qcom/Kconfig ***
 #-
 SND_SOC_QCOM all=m
 
+#-
+#- *** FILE: sound/soc/sunxi/Kconfig ***
+#-
+SND_SUN4I_CODEC all=m
+
 #-
 #- *** FILE: sound/soc/xtensa/Kconfig ***
 #-
@@ -10557,13 +10822,32 @@ RD_LZ4 all=y
 #-
 AMD_XGBE_PHY all=m
 ARM_AT91_ETHER all=m
+B43_PCMCIA all=y
+BATTERY_BQ27X00_I2C all=y
+BATTERY_BQ27X00_PLATFORM all=y
+BATTERY_BQ27x00 all=m
 BLK_DEV_CELLEB ppc64=m
 BLK_DEV_XIP all=y
+COMEDI_UNIOXX5 all=m
+DEFAULT_SECURITY_YAMA all=n
+DRM_I915_FBDEV all=y
+DRM_I915_KMS all=y
+DRM_PTN3460 all=m
 DT3155_CCIR all=y
 DT3155_STREAMING all=y
 DWC3_HOST_USB3_LPM_ENABLE all=y
+EDAC_MCE_INJ all=m
 EXT2_FS_XIP all=y
+EXT3_DEFAULTS_TO_ORDERED all=n
+EXT3_FS_XATTR all=y
+EXT4_USE_FOR_EXT23 all=y
+FB_SM7XX all=m
 FS_XIP all=y
+FT1000 all=m
+FT1000_PCMCIA all=m
+FT1000_USB all=m
+GENEVE_CORE all=m
+GPIO_IT8761E all=m
 HID_HUION all=m
 HVC_BEAT ppc64=n
 I2O all=m sparc=n
@@ -10576,19 +10860,35 @@ I2O_EXT_ADAPTEC_DMA64 all=y
 I2O_LCT_NOTIFY_ON_CHANGES all=y
 I2O_PROC all=m
 I2O_SCSI all=m
+IDMA64 all=m
 INIT_FALLBACK all=y
 INTEL_MID_DMAC all=m
+IP1000 all=m
+JBD all=m
+JBD_DEBUG all=n
 KEYS_DEBUG_PROC_KEYS all=n
+LEDS_PM8941_WLED all=m
 LINE6_USB all=m
 LINE6_USB_IMPULSE_RESPONSE all=n
 MEDIA_PARPORT_SUPPORT all=y
+MMC_CLKGATE all=n
+NETFILTER_NETLINK_QUEUE_CT all=y
+NETLINK_MMAP all=y
 NFC_ST21NFCB all=m
 NFC_ST21NFCB_I2C all=m
 PATA_SCC ppc64=m
+RCU_CPU_STALL_INFO all=n
 RCU_FANOUT_EXACT all=n
+RCU_USER_QS all=n
+RT_MUTEX_TESTER all=n
+SCSI_MPT2SAS_LOGGING all=y
+SCSI_MPT3SAS_LOGGING all=y
+SECURITY_YAMA_STACKED all=y
 SERIAL_MFD_HSU all=m
 SERIAL_MRST_MAX3110 all=m
 SND_HDA_INPUT_JACK all=y
+SND_SOC_HDMI_CODEC all=m
+STOP_MACHINE all=y
 SUNRPC_XPRT_RDMA_CLIENT all=m
 SUNRPC_XPRT_RDMA_SERVER all=m
 TCG_ST33_I2C all=m
@@ -10603,6 +10903,12 @@ UNISYS_VIRTPCI all=m
 UNISYS_VISORCHANNEL all=m
 UNISYS_VISORCHIPSET all=m
 UNISYS_VISORUTIL all=m
+USB_DWC3_DEBUG all=n
+USB_FUSBH200_HCD all=m
+USB_RIO500 all=m
+USB_WPAN_HCD all=m
+VGACON_SOFT_SCROLLBACK all=n ia64=y
+VGACON_SOFT_SCROLLBACK_SIZE ia64=64
 VIDEO_BTCX all=m sparc=
 VIDEO_BWQCAM all=m
 VIDEO_CQCAM all=m
@@ -10610,4 +10916,5 @@ VIDEO_PMS all=m
 VIDEO_SAA7191 all=m
 VIDEO_TLG2300 all=m
 VIDEO_W9966 all=m
+X86_DEBUG_STATIC_CPU_HAS all=n
 ZRAM_DEBUG all=n