UBUNTU: Rebase to v4.13-rc1

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/changelog b/debian.master/changelog
index 0ba3a4e066a09eab0832d15aec27acb27114558f..794f517292989577ef85e3a4c1a8c77a02f7bcd2 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -4,6 +4,10 @@ linux (4.13.0-0.1) UNRELEASED; urgency=low
   CHANGELOG: Use the printchanges target to see the curent changes.
   CHANGELOG: Use the insertchanges target to create the final log.
 
+  [ Upstream Kernel Changes ]
+
+  * Rebase to v4.13-rc1
+
  -- Seth Forshee <seth.forshee@canonical.com>  Tue, 18 Jul 2017 13:08:07 -0500
 
 linux (4.12.0-7.8) artful; urgency=low

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index ff8cc11c1408a8f38975ee7c93523e3a01f59be3..3a13dcc79471dc5152b2a855707e4050ed12eafd 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -29,6 +29,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_WANTS_THP_SWAP=y
 # CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 CONFIG_ARCNET=m
 CONFIG_ATA=y
@@ -75,6 +76,7 @@ CONFIG_CRAMFS=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
 # CONFIG_CXL_BASE is not set
+# CONFIG_CXL_LIB is not set
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DMADEVICES=y
@@ -89,6 +91,7 @@ CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI=y
+CONFIG_EFI_CAPSULE_LOADER=m
 CONFIG_EFI_DEV_PATH_PARSER=y
 CONFIG_EFS_FS=m
 # CONFIG_EM_TIMER_STI is not set
@@ -103,6 +106,7 @@ CONFIG_FB_BOOT_VESA_SUPPORT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_MACMODES is not set
+# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 CONFIG_FDDI=y
 CONFIG_FEALNX=m
 CONFIG_FIREWIRE=m
@@ -138,12 +142,12 @@ CONFIG_HSR=m
 CONFIG_HTC_PASIC3=m
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HWMON=y
+CONFIG_HWSPINLOCK=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HYPERV_TSCPAGE=y
 # CONFIG_HZ_100 is not set
 CONFIG_I2C=y
 # CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_SLAVE is not set
 CONFIG_I6300ESB_WDT=m
 CONFIG_IEEE802154=m
 CONFIG_IIO=m
@@ -277,7 +281,7 @@ CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NVMEM=m
+CONFIG_NVMEM=y
 CONFIG_N_GSM=m
 # CONFIG_OF is not set
 CONFIG_OMFS_FS=m
@@ -371,7 +375,6 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_PM8001=m
@@ -416,7 +419,6 @@ CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_EMU10K1_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 CONFIG_SND_PCM=m
-# CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_I2C_AND_SPI=m

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index a0a9cf454768ee8725eec4ee8b5f04ef02deeab5..e2365fae3136c3a2331f1c08ab0f1fccbfe5efc9 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -659,7 +659,7 @@ CONFIG_VEXPRESS_CONFIG                          policy<{'arm64': 'y', 'armhf': '
 
 # Menu: Device Drivers >> Character devices
 CONFIG_DEVMEM                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_DEVKMEM                                  policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_DEVKMEM                                  policy<{'amd64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_TTY_PRINTK                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_PRINTER                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_LP_CONSOLE                               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
@@ -10502,7 +10502,6 @@ CONFIG_PPC_BOOK3E_64                            policy<{'ppc64el': 'n'}>
 # Menu: Processor type and features
 CONFIG_ARCH_RANDOM                              policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_SPARSEMEM_VMEMMAP                        policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_MOVABLE_NODE                             policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_BALLOON_COMPACTION                       policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_COMPACTION                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_MIGRATION                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
@@ -10537,7 +10536,6 @@ CONFIG_PARAVIRT                                 policy<{'amd64': 'y', 'arm64': '
 CONFIG_PARAVIRT_TIME_ACCOUNTING                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n'}>
 CONFIG_XEN                                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'n', 'i386': 'y'}>
 #
-CONFIG_MOVABLE_NODE                             mark<ENFORCED> note<LP:1667081>
 CONFIG_DEFAULT_MMAP_MIN_ADDR                    mark<ENFORCED> note<LP:1418140 LP:1531327>
 CONFIG_TRANSPARENT_HUGEPAGE                     flag<REVIEW>
 CONFIG_MEM_SOFT_DIRTY                           flag<REVIEW>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index ca3e5a8e76346c784b72608b4f4fbc7f86c94a90..7d1b839f72af8f6614073b1f07ff4caf0d63baf5 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -35,6 +35,7 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_UNIPHIER is not set
+# CONFIG_ARCH_WANTS_THP_SWAP is not set
 # CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 CONFIG_ARCNET=m
 CONFIG_ARM_SMMU=y
@@ -85,6 +86,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM_IMX is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
 # CONFIG_CXL_BASE is not set
+# CONFIG_CXL_LIB is not set
 # CONFIG_DEBUG_ALIGN_RODATA is not set
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
@@ -100,6 +102,7 @@ CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI=y
+CONFIG_EFI_CAPSULE_LOADER=m
 # CONFIG_EFI_DEV_PATH_PARSER is not set
 CONFIG_EFS_FS=m
 # CONFIG_EM_TIMER_STI is not set
@@ -114,6 +117,7 @@ CONFIG_FB=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_MACMODES is not set
+# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 CONFIG_FDDI=y
 CONFIG_FEALNX=m
 CONFIG_FIREWIRE=m
@@ -151,6 +155,7 @@ CONFIG_HSR=m
 CONFIG_HTC_PASIC3=m
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HWMON=y
+CONFIG_HWSPINLOCK=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_HYPERV_TSCPAGE is not set
 CONFIG_HZ=250
@@ -160,7 +165,6 @@ CONFIG_HZ_250=y
 CONFIG_I2C=y
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_IMX=m
-CONFIG_I2C_SLAVE=y
 CONFIG_I6300ESB_WDT=m
 CONFIG_IEEE802154=m
 CONFIG_IIO=m
@@ -178,7 +182,6 @@ CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INPUT=y
 CONFIG_IOMMU_IOVA=y
-CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 CONFIG_IPACK_BUS=m
 CONFIG_IPMI_HANDLER=m
 CONFIG_IPX=m
@@ -295,7 +298,7 @@ CONFIG_NR_CPUS=256
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_NVMEM=m
+CONFIG_NVMEM=y
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
@@ -390,7 +393,6 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_PM8001=m
@@ -436,7 +438,6 @@ CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_EMU10K1_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 CONFIG_SND_PCM=m
-# CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_I2C_AND_SPI=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index fd0dda1930d72ba2dcc037d279a2a3f12ef8d8a1..77caad1c50bd670ef088c3570359729854697dda 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -28,6 +28,7 @@ CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 CONFIG_ARCH_UNIPHIER=y
+# CONFIG_ARCH_WANTS_THP_SWAP is not set
 # CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 CONFIG_ARCNET=m
 # CONFIG_ARM_SMMU is not set
@@ -76,6 +77,7 @@ CONFIG_CRAMFS=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_IMX=y
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
 # CONFIG_CXL_BASE is not set
+# CONFIG_CXL_LIB is not set
 CONFIG_DEBUG_ALIGN_RODATA=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
@@ -103,6 +105,7 @@ CONFIG_FB=y
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_MACMODES is not set
+CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA=y
 CONFIG_FDDI=y
 CONFIG_FEALNX=m
 CONFIG_FIREWIRE=m
@@ -135,6 +138,7 @@ CONFIG_HSI=m
 CONFIG_HSR=m
 CONFIG_HTC_PASIC3=m
 CONFIG_HWMON=y
+CONFIG_HWSPINLOCK=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_HYPERV_TSCPAGE is not set
 CONFIG_HZ=250
@@ -144,7 +148,6 @@ CONFIG_HZ_250=y
 CONFIG_I2C=y
 CONFIG_I2C_EMEV2=m
 CONFIG_I2C_IMX=y
-CONFIG_I2C_SLAVE=y
 CONFIG_I6300ESB_WDT=m
 CONFIG_IEEE802154=m
 CONFIG_IIO=m
@@ -276,7 +279,7 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=4
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
-CONFIG_NVMEM=m
+CONFIG_NVMEM=y
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
@@ -368,7 +371,6 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_PM8001=m
@@ -413,7 +415,6 @@ CONFIG_SND_COMPRESS_OFFLOAD=y
 CONFIG_SND_DMAENGINE_PCM=y
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 CONFIG_SND_PCM=y
-# CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 CONFIG_SND_TIMER=y
@@ -462,7 +463,6 @@ CONFIG_USB_G_MULTI=m
 # CONFIG_USB_HCD_BCMA is not set
 # CONFIG_USB_HCD_SSB is not set
 CONFIG_USB_MUSB_HDRC=y
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 CONFIG_VFIO=m

diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic
index 2d5b2eac9418e34824b479dea716ee4d4ac818b8..8ffe02cb3acc80fc99622b403fd9d040659c0311 100644 (file)
--- a/debian.master/config/armhf/config.flavour.generic
+++ b/debian.master/config/armhf/config.flavour.generic
@@ -13,7 +13,6 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
 CONFIG_FB_CFB_REV_PIXELS_IN_BYTE=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 # CONFIG_HUGETLB_PAGE is not set
-# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
 CONFIG_PGTABLE_LEVELS=2
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_PWM_TIECAP=m
@@ -29,3 +28,4 @@ CONFIG_SND_SOC_IMX_AUDMUX=y
 CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SGTL5000=y
 CONFIG_SOC_AM33XX=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m

diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae
index b416d32dd9b34d2256a6524e75da8200dce71441..92d02d0d5dd8de760dc253e952714aa545f5885a 100644 (file)
--- a/debian.master/config/armhf/config.flavour.generic-lpae
+++ b/debian.master/config/armhf/config.flavour.generic-lpae
@@ -13,7 +13,6 @@ CONFIG_ARM_LPAE=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_HUGETLB_PAGE=y
-CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_PWM_TIECAP is not set
@@ -29,3 +28,4 @@ CONFIG_SND_SOC_IMX_AUDMUX=m
 # CONFIG_SND_SOC_RT5677_SPI is not set
 CONFIG_SND_SOC_SGTL5000=m
 # CONFIG_SOC_AM33XX is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4ee4e99ea3e3dad6bf4db85c7b8e24e0728753e6..1a322800d5186006d91cbe4a8cbf195c4506b8f2 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -51,6 +51,7 @@ CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_SEA=y
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_BUTTON=y
@@ -287,6 +288,7 @@ CONFIG_APQ_MMCC_8084=m
 CONFIG_AQTION=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
+CONFIG_ARCH_ACTIONS=y
 CONFIG_ARCH_ARTPEC=y
 # CONFIG_ARCH_AT91 is not set
 CONFIG_ARCH_AXXIA=y
@@ -294,6 +296,7 @@ CONFIG_ARCH_AXXIA=y
 CONFIG_ARCH_BCM2835=y
 CONFIG_ARCH_BCM_IPROC=y
 CONFIG_ARCH_BERLIN=y
+CONFIG_ARCH_BINFMT_ELF_STATE=y
 CONFIG_ARCH_BRCMSTB=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
@@ -323,9 +326,12 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_ARCH_HAS_MMIO_FLUSH=y
 CONFIG_ARCH_HAS_PKEYS=y
@@ -335,8 +341,10 @@ CONFIG_ARCH_HAS_SCALED_CPUTIME=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_HAS_ZONE_DEVICE=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_HI3xxx=y
@@ -426,6 +434,7 @@ CONFIG_ARCH_R8A7796=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_ARCH_RCAR_GEN1=y
 CONFIG_ARCH_RCAR_GEN2=y
+CONFIG_ARCH_REALTEK=y
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_RENESAS=y
 CONFIG_ARCH_RMOBILE=y
@@ -477,7 +486,7 @@ CONFIG_ARCH_VEXPRESS_DCSCB=y
 CONFIG_ARCH_VEXPRESS_SPC=y
 CONFIG_ARCH_VEXPRESS_TC2_PM=y
 CONFIG_ARCH_VIRT=y
-CONFIG_ARCH_VULCAN=y
+# CONFIG_ARCH_VULCAN is not set
 # CONFIG_ARCH_W90X900 is not set
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
@@ -653,6 +662,8 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
 # CONFIG_ASYNC_RAID6_TEST is not set
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_ASYNC_TX_DMA=y
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_ASYNC_XOR=m
@@ -670,6 +681,7 @@ CONFIG_ATH10K_AHB=y
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_SDIO=m
 CONFIG_ATH10K_TRACING=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
@@ -844,7 +856,9 @@ CONFIG_BATTERY_88PM860X=m
 CONFIG_BATTERY_ACT8945A=m
 CONFIG_BATTERY_AXP20X=m
 CONFIG_BATTERY_BQ27XXX=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
 CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_CPCAP=m
 CONFIG_BATTERY_DA9030=m
 CONFIG_BATTERY_DA9052=m
 CONFIG_BATTERY_DA9150=m
@@ -892,6 +906,7 @@ CONFIG_BCM_FLEXRM_MBOX=m
 CONFIG_BCM_IPROC_ADC=m
 CONFIG_BCM_NET_PHYLIB=m
 CONFIG_BCM_PDC_MBOX=m
+CONFIG_BCM_SBA_RAID=m
 CONFIG_BCM_VIDEOCORE=m
 CONFIG_BE2NET=m
 CONFIG_BE2NET_HWMON=y
@@ -932,7 +947,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_BLK_DEV_NVME_SCSI=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -1191,7 +1205,6 @@ CONFIG_CAVIUM_ERRATUM_30115=y
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 CONFIG_CC10001_ADC=m
-# CONFIG_CCREE_DISABLE_COHERENT_DMA_OPS is not set
 # CONFIG_CCREE_FIPS_SUPPORT is not set
 CONFIG_CCW=y
 CONFIG_CCWGROUP=m
@@ -1253,6 +1266,7 @@ CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_ISP1704=m
 CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_LP8788=m
+CONFIG_CHARGER_LTC3651=m
 CONFIG_CHARGER_MANAGER=y
 CONFIG_CHARGER_MAX14577=m
 CONFIG_CHARGER_MAX77693=m
@@ -1292,10 +1306,10 @@ CONFIG_CIFS=m
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_FSCACHE=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_SMB2=y
 CONFIG_CIFS_SMB311=y
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
@@ -1308,22 +1322,40 @@ CONFIG_CLEANCACHE=y
 CONFIG_CLKBLD_I8253=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKEVT_I8253=y
-CONFIG_CLKSRC_ACPI=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_CLKSRC_EXYNOS_MCT=y
 CONFIG_CLKSRC_I8253=y
 CONFIG_CLKSRC_IMX_GPT=y
 CONFIG_CLKSRC_MMIO=y
-CONFIG_CLKSRC_OF=y
-CONFIG_CLKSRC_PROBE=y
 CONFIG_CLKSRC_QCOM=y
 CONFIG_CLKSRC_TANGO_XTAL=y
 CONFIG_CLKSRC_TI_32K=y
 CONFIG_CLKSRC_VERSATILE=y
 CONFIG_CLK_BCM_NS2=y
+CONFIG_CLK_BCM_SR=y
+CONFIG_CLK_EMEV2=y
 CONFIG_CLK_QORIQ=y
+CONFIG_CLK_R8A7740=y
+CONFIG_CLK_R8A7743=y
+CONFIG_CLK_R8A7745=y
+CONFIG_CLK_R8A7778=y
+CONFIG_CLK_R8A7779=y
+CONFIG_CLK_R8A7790=y
+CONFIG_CLK_R8A7791=y
+CONFIG_CLK_R8A7792=y
+CONFIG_CLK_R8A7794=y
+CONFIG_CLK_R8A7795=y
+CONFIG_CLK_R8A7796=y
+CONFIG_CLK_RCAR_GEN2=y
+CONFIG_CLK_RCAR_GEN2_CPG=y
+CONFIG_CLK_RCAR_GEN3_CPG=y
+CONFIG_CLK_RENESAS=y
 CONFIG_CLK_RENESAS_CPG_MSSR=y
 CONFIG_CLK_RENESAS_CPG_MSTP=y
+CONFIG_CLK_RENESAS_DIV6=y
+CONFIG_CLK_RENESAS_LEGACY=y
+CONFIG_CLK_RZA1=y
+CONFIG_CLK_SH73A0=y
 CONFIG_CLK_SP810=y
 CONFIG_CLK_TWL6040=m
 CONFIG_CLK_UNIPHIER=y
@@ -1558,6 +1590,7 @@ CONFIG_CORDIC=m
 CONFIG_COREDUMP=y
 # CONFIG_CORESIGHT is not set
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_CORTINA_PHY=m
 CONFIG_COSA=m
 # CONFIG_CPA_DEBUG is not set
 CONFIG_CPCAP_ADC=m
@@ -1625,6 +1658,7 @@ CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
 # CONFIG_CRC32_SLICEBY4 is not set
 CONFIG_CRC32_SLICEBY8=y
+CONFIG_CRC4=m
 CONFIG_CRC7=m
 CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
@@ -1634,6 +1668,7 @@ CONFIG_CROSS_COMPILE=""
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_EC_CHARDEV=m
 CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_LPC_MEC=y
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CRYPTO=y
@@ -1734,10 +1769,13 @@ CONFIG_CRYPTO_DEV_MEDIATEK=m
 CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_MXC_SCC=m
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
+CONFIG_CRYPTO_DEV_OMAP=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
@@ -1801,6 +1839,7 @@ CONFIG_CRYPTO_MD5_PPC=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PAES_S390=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -2086,6 +2125,7 @@ CONFIG_DM_UEVENT=y
 CONFIG_DM_VERITY=m
 # CONFIG_DM_VERITY_FEC is not set
 CONFIG_DM_ZERO=m
+CONFIG_DM_ZONED=m
 CONFIG_DNOTIFY=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_DONGLE=y
@@ -2163,6 +2203,7 @@ CONFIG_DRM_I915_GVT=y
 CONFIG_DRM_I915_GVT_KVMGT=m
 # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
 # CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
 # CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
 CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_WERROR is not set
@@ -2203,6 +2244,8 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NXP_PTN3460=m
 # CONFIG_DRM_OMAP is not set
 CONFIG_DRM_PANEL=y
+CONFIG_DRM_PANEL_BRIDGE=y
+CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
 CONFIG_DRM_PANEL_JDI_LT070ME05000=m
 CONFIG_DRM_PANEL_LG_LG4573=m
 CONFIG_DRM_PANEL_LVDS=m
@@ -2215,6 +2258,7 @@ CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 CONFIG_DRM_PARADE_PS8622=m
+CONFIG_DRM_PL111=m
 CONFIG_DRM_QXL=m
 CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_USERPTR is not set
@@ -2227,6 +2271,7 @@ CONFIG_DRM_SHMOBILE=m
 CONFIG_DRM_SII902X=m
 CONFIG_DRM_SIL_SII8620=m
 # CONFIG_DRM_STI is not set
+CONFIG_DRM_STM=m
 CONFIG_DRM_TEGRA=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
 CONFIG_DRM_TEGRA_STAGING=y
@@ -2521,7 +2566,7 @@ CONFIG_EFIVAR_FS=y
 CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT=y
 CONFIG_EFI_ARMSTUB=y
 CONFIG_EFI_BOOTLOADER_CONTROL=m
-CONFIG_EFI_CAPSULE_LOADER=m
+CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
 CONFIG_EFI_ESRT=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_MIXED=y
@@ -2589,6 +2634,7 @@ CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_INTEL_CHT_WC=m
 CONFIG_EXTCON_INTEL_INT3496=m
 CONFIG_EXTCON_MAX14577=m
 CONFIG_EXTCON_MAX3355=m
@@ -2742,7 +2788,6 @@ CONFIG_FB_OPENCORES=m
 CONFIG_FB_PM2=m
 CONFIG_FB_PM2_FIFO_DISCONNECT=y
 CONFIG_FB_PM3=m
-# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_BACKLIGHT=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -2860,6 +2905,7 @@ CONFIG_FONT_ACORN_8x8=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FORCEDETH=m
 CONFIG_FORCE_SMP=y
+CONFIG_FORTIFY_SOURCE=y
 CONFIG_FPGA=m
 CONFIG_FPGA_BRIDGE=m
 CONFIG_FPGA_MGR_ICE40_SPI=m
@@ -2878,6 +2924,9 @@ CONFIG_FSCACHE=m
 # CONFIG_FSCACHE_OBJECT_LIST is not set
 CONFIG_FSCACHE_STATS=y
 CONFIG_FSI=m
+CONFIG_FSI_MASTER_GPIO=m
+CONFIG_FSI_MASTER_HUB=m
+CONFIG_FSI_SCOM=m
 CONFIG_FSL_DPAA2=y
 CONFIG_FSL_DPAA2_ETH=m
 CONFIG_FSL_EDMA=m
@@ -2908,7 +2957,6 @@ CONFIG_FTRACE_SYSCALLS=y
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 CONFIG_FUJITSU_ES=m
 CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_FUJITSU_TABLET=m
 CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
@@ -2931,6 +2979,7 @@ CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_GACT_PROB=y
 CONFIG_GADGET_UAC1=y
+# CONFIG_GADGET_UAC1_LEGACY is not set
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
 CONFIG_GAMEPORT_L4=m
@@ -2943,6 +2992,7 @@ CONFIG_GDB_SCRIPTS=y
 CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_GENERIC_ARCH_TOPOLOGY=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -2960,6 +3010,8 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_IRQ_CHIP=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
@@ -2979,7 +3031,6 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_TIME_VSYSCALL_OLD=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_GENEVE=m
 CONFIG_GENWQE=m
@@ -3040,6 +3091,7 @@ CONFIG_GPIO_JANZ_TTL=m
 CONFIG_GPIO_KEMPLD=m
 CONFIG_GPIO_LP3943=m
 CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_LP87565=m
 CONFIG_GPIO_LYNXPOINT=y
 CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX7301=m
@@ -3047,7 +3099,6 @@ CONFIG_GPIO_MAX730X=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_MAX77620=m
 CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_MCP23S08=m
 CONFIG_GPIO_MENZ127=m
 # CONFIG_GPIO_MERRIFIELD is not set
 CONFIG_GPIO_ML_IOH=m
@@ -3098,6 +3149,7 @@ CONFIG_GPIO_XGENE=y
 CONFIG_GPIO_XGENE_SB=m
 CONFIG_GPIO_XILINX=y
 CONFIG_GPIO_XLP=m
+CONFIG_GPIO_XRA1403=m
 CONFIG_GPIO_ZEVIO=y
 CONFIG_GPIO_ZYNQ=m
 CONFIG_GRACE_PERIOD=m
@@ -3134,6 +3186,7 @@ CONFIG_HARDENED_USERCOPY=y
 # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR_PERF=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
@@ -3189,8 +3242,10 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUTEX_CMPXCHG=y
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_HAVE_GENERIC_RCU_GUP=y
+CONFIG_HAVE_GENERIC_GUP=y
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IMA_KEXEC=y
@@ -3239,6 +3294,7 @@ CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_HAVE_NMI=y
+CONFIG_HAVE_NMI_WATCHDOG=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_PATA_PLATFORM=y
@@ -3322,6 +3378,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -3352,6 +3409,7 @@ CONFIG_HID_PID=y
 CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_RETRODE=m
 CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
@@ -3520,9 +3578,9 @@ CONFIG_HWLAT_TRACER=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HWMON_VID=m
 CONFIG_HWPOISON_INJECT=m
-CONFIG_HWSPINLOCK=m
 CONFIG_HWSPINLOCK_OMAP=m
 CONFIG_HWSPINLOCK_QCOM=m
+CONFIG_HWSPINLOCK_SPRD=m
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HW_RANDOM=y
@@ -3585,9 +3643,10 @@ CONFIG_I2C_CROS_EC_TUNNEL=m
 # CONFIG_I2C_DEBUG_CORE is not set
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_DLN2=m
 CONFIG_I2C_EG20T=m
@@ -3607,6 +3666,7 @@ CONFIG_I2C_MPC=m
 CONFIG_I2C_MT65XX=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_GPMUX=m
 CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX_MLXCPLD=m
 CONFIG_I2C_MUX_PCA9541=m
@@ -3642,6 +3702,7 @@ CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_SIS5595=m
 CONFIG_I2C_SIS630=m
 CONFIG_I2C_SIS96X=m
+CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_STUB=m
@@ -3724,6 +3785,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_MS_SENSORS_I2C=m
+CONFIG_IIO_MUX=m
 CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
 # CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
@@ -3757,10 +3819,10 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 # CONFIG_IKCONFIG is not set
 CONFIG_IMA=y
 CONFIG_IMA_APPRAISE=y
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
 # CONFIG_IMA_APPRAISE_SIGNED_INIT is not set
 # CONFIG_IMA_BLACKLIST_KEYRING is not set
 # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
-# CONFIG_IMA_DEFAULT_HASH_WP512 is not set
 CONFIG_IMA_KEXEC=y
 # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
 CONFIG_IMA_LSM_RULES=y
@@ -3775,6 +3837,7 @@ CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 CONFIG_IMX7_PM_DOMAINS=y
 CONFIG_IMX_DMA=m
+CONFIG_IMX_GPCV2=y
 CONFIG_IMX_IPUV3_CORE=m
 CONFIG_IMX_SDMA=m
 CONFIG_IMX_THERMAL=m
@@ -3965,6 +4028,7 @@ CONFIG_INTEL_GTT=y
 CONFIG_INTEL_HID_EVENT=m
 CONFIG_INTEL_IDLE=y
 CONFIG_INTEL_IDMA64=m
+CONFIG_INTEL_INT0002_VGPIO=m
 CONFIG_INTEL_IOATDMA=m
 CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
@@ -4002,6 +4066,7 @@ CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INTEL_SOC_PMIC=y
 CONFIG_INTEL_SOC_PMIC_BXTWC=m
+CONFIG_INTEL_SOC_PMIC_CHTWC=m
 CONFIG_INTEL_TELEMETRY=m
 CONFIG_INTEL_TH=m
 # CONFIG_INTEL_TH_DEBUG is not set
@@ -4025,6 +4090,7 @@ CONFIG_IOMMU_DMA=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_IOMMU_IO_PGTABLE=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_IOMMU_SUPPORT=y
@@ -4068,6 +4134,7 @@ CONFIG_IPC_NS=y
 # CONFIG_IPDDP is not set
 # CONFIG_IPIC is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_DMI_DECODE=y
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_POWERNV=m
 CONFIG_IPMI_POWEROFF=m
@@ -4078,6 +4145,7 @@ CONFIG_IPMMU_VMSA=y
 CONFIG_IPPP_FILTER=y
 CONFIG_IPQ_GCC_4019=m
 CONFIG_IPQ_GCC_806X=m
+CONFIG_IPQ_GCC_8074=m
 CONFIG_IPQ_LCC_806X=m
 CONFIG_IPV6=y
 CONFIG_IPV6_FOU=m
@@ -4414,6 +4482,7 @@ CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_BCM=m
 CONFIG_KEYBOARD_CAP11XX=m
 CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_IMX=m
@@ -4526,6 +4595,7 @@ CONFIG_LCD_TDO24M=m
 CONFIG_LCD_VGG2432A4=m
 CONFIG_LCS=m
 # CONFIG_LDM_DEBUG is not set
+# CONFIG_LD_HEAD_STUB_CATCH is not set
 CONFIG_LEDS_88PM860X=m
 CONFIG_LEDS_AAT1290=m
 CONFIG_LEDS_ADP5520=m
@@ -4710,6 +4780,7 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 CONFIG_MAC802154=m
 CONFIG_MACB=m
 CONFIG_MACB_PCI=m
+CONFIG_MACB_USE_HWSTAMP=y
 CONFIG_MACHZ_WDT=m
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_375=y
@@ -4761,6 +4832,7 @@ CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z9_109_TUNE is not set
 CONFIG_MARCH_ZEC12=y
 CONFIG_MARCH_ZEC12_TUNE=y
+CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_MATOM is not set
@@ -4787,7 +4859,6 @@ CONFIG_MAY_USE_DEVLINK=m
 CONFIG_MC3230=m
 CONFIG_MCB_LPC=m
 CONFIG_MCB_PCI=m
-CONFIG_MCE_AMD_INJ=m
 # CONFIG_MCORE2 is not set
 CONFIG_MCP2120_DONGLE=m
 CONFIG_MCP320X=m
@@ -4995,6 +5066,7 @@ CONFIG_MFD_TC6393XB=y
 CONFIG_MFD_TIMBERDALE=m
 CONFIG_MFD_TI_LMU=m
 CONFIG_MFD_TI_LP873X=m
+CONFIG_MFD_TI_LP87565=m
 CONFIG_MFD_TPS65086=m
 CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS65218=m
@@ -5024,6 +5096,8 @@ CONFIG_MFD_WM8998=y
 # CONFIG_MGEODE_LX is not set
 CONFIG_MICREL_KS8995MA=m
 CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_KSZ=m
+CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m
 CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_AMD=y
@@ -5059,12 +5133,16 @@ CONFIG_MLX4_DEBUG=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_ACCEL=y
 CONFIG_MLX5_CORE=m
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_CORE_IPOIB=y
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_FPGA=y
 CONFIG_MLX5_INFINIBAND=m
 CONFIG_MLX90614=m
+CONFIG_MLXFW=m
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_CORE_HWMON=y
 CONFIG_MLXSW_CORE_THERMAL=y
@@ -5088,7 +5166,6 @@ CONFIG_MMA9553=m
 CONFIG_MMC35240=m
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_BCM2835=m
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CAVIUM_THUNDERX=m
 CONFIG_MMC_CB710=m
@@ -5202,7 +5279,6 @@ CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOVABLE_NODE=y
 CONFIG_MOXA_INTELLIO=m
 CONFIG_MOXA_SMARTIO=m
 # CONFIG_MPENTIUM4 is not set
@@ -5294,6 +5370,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+CONFIG_MTD_MCHP23K256=m
 CONFIG_MTD_MT81xx_NOR=m
 CONFIG_MTD_MTDRAM=m
 CONFIG_MTD_NAND_BRCMNAND=m
@@ -5387,10 +5464,14 @@ CONFIG_MTRR=y
 CONFIG_MTRR_SANITIZER=y
 CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_MULTIPLEXER=m
 CONFIG_MULTIUSER=y
 CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_MUX_ADG792A=m
+CONFIG_MUX_GPIO=m
+CONFIG_MUX_MMIO=m
 CONFIG_MV643XX_ETH=m
 CONFIG_MVEBU_CLK_COMMON=y
 CONFIG_MVEBU_CLK_COREDIV=y
@@ -5606,6 +5687,7 @@ CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
 CONFIG_NET_DSA_TAG_BRCM=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_KSZ=y
 CONFIG_NET_DSA_TAG_LAN9303=y
 CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_DSA_TAG_QCA=y
@@ -5740,6 +5822,7 @@ CONFIG_NFC_ST_NCI=m
 CONFIG_NFC_ST_NCI_I2C=m
 CONFIG_NFC_ST_NCI_SPI=m
 CONFIG_NFC_TRF7970A=m
+CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_BLOCKLAYOUT=y
@@ -5963,6 +6046,7 @@ CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
 CONFIG_NSC_GPIO=m
 # CONFIG_NTB_AMD is not set
+CONFIG_NTB_IDT=m
 CONFIG_NTB_INTEL=m
 CONFIG_NTB_NETDEV=m
 CONFIG_NTB_PERF=m
@@ -6075,7 +6159,11 @@ CONFIG_ORION_WATCHDOG=m
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_INDEX is not set
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OWL_PM_DOMAINS=y
+CONFIG_OWL_PM_DOMAINS_HELPER=y
+CONFIG_OWL_TIMER=y
 CONFIG_P54_COMMON=m
 CONFIG_P54_LEDS=y
 CONFIG_P54_PCI=m
@@ -6152,6 +6240,7 @@ CONFIG_PATA_CS5535=m
 CONFIG_PATA_CS5536=m
 CONFIG_PATA_CYPRESS=m
 CONFIG_PATA_EFAR=m
+CONFIG_PATA_FTIDE010=m
 CONFIG_PATA_HPT366=m
 CONFIG_PATA_HPT37X=m
 CONFIG_PATA_HPT3X2N=m
@@ -6222,6 +6311,8 @@ CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_IPROC=m
 CONFIG_PCIE_IPROC_MSI=y
 CONFIG_PCIE_IPROC_PLATFORM=m
+CONFIG_PCIE_KIRIN=y
+CONFIG_PCIE_MEDIATEK=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
@@ -6260,6 +6351,7 @@ CONFIG_PCI_HYPERV=m
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_LABEL=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MVEBU=y
@@ -6300,6 +6392,8 @@ CONFIG_PCWATCHDOG=m
 CONFIG_PD6729=m
 CONFIG_PDA_POWER=m
 CONFIG_PDC_ADMA=m
+CONFIG_PEAQ_WMI=m
+# CONFIG_PERCPU_STATS is not set
 # CONFIG_PERCPU_TEST is not set
 CONFIG_PERF_EVENTS=y
 # CONFIG_PERF_EVENTS_AMD_POWER is not set
@@ -6315,6 +6409,7 @@ CONFIG_PHY_BCM_NS_USB3=m
 CONFIG_PHY_BERLIN_SATA=m
 CONFIG_PHY_BERLIN_USB=m
 CONFIG_PHY_BRCM_SATA=y
+CONFIG_PHY_CPCAP_USB=m
 CONFIG_PHY_DM816X_USB=m
 # CONFIG_PHY_EXYNOS4210_USB2 is not set
 # CONFIG_PHY_EXYNOS4X12_USB2 is not set
@@ -6326,9 +6421,11 @@ CONFIG_PHY_EXYNOS_PCIE=y
 CONFIG_PHY_HI6220_USB=m
 CONFIG_PHY_HIX5HD2_SATA=m
 CONFIG_PHY_MESON8B_USB2=m
+CONFIG_PHY_MESON_GXL_USB2=m
 CONFIG_PHY_MT65XX_USB3=m
 CONFIG_PHY_MVEBU_SATA=y
 CONFIG_PHY_NS2_PCIE=y
+CONFIG_PHY_NS2_USB_DRD=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_QCOM_QMP=m
@@ -6338,6 +6435,7 @@ CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_RCAR_GEN2=m
 CONFIG_PHY_RCAR_GEN3_USB2=m
+CONFIG_PHY_RCAR_GEN3_USB3=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=m
@@ -6366,9 +6464,11 @@ CONFIG_PINCTRL_BCM2835=y
 CONFIG_PINCTRL_BERLIN=y
 CONFIG_PINCTRL_BERLIN_BG4CT=y
 CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
 CONFIG_PINCTRL_DOVE=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS5440=y
+CONFIG_PINCTRL_EXYNOS_ARM=y
 CONFIG_PINCTRL_GEMINILAKE=m
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX50=y
@@ -6381,8 +6481,10 @@ CONFIG_PINCTRL_IMX7D=y
 CONFIG_PINCTRL_INTEL=m
 CONFIG_PINCTRL_IPQ4019=m
 CONFIG_PINCTRL_IPQ8064=m
+CONFIG_PINCTRL_IPQ8074=m
 CONFIG_PINCTRL_IPROC_GPIO=y
 CONFIG_PINCTRL_MAX77620=m
+CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_MDM9615=m
 # CONFIG_PINCTRL_MERRIFIELD is not set
 CONFIG_PINCTRL_MESON=y
@@ -6395,7 +6497,6 @@ CONFIG_PINCTRL_MSM8996=m
 CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MT2701=y
 CONFIG_PINCTRL_MT6397=y
-CONFIG_PINCTRL_MT7623=y
 CONFIG_PINCTRL_MT8127=y
 CONFIG_PINCTRL_MT8135=y
 CONFIG_PINCTRL_MT8173=y
@@ -6405,6 +6506,8 @@ CONFIG_PINCTRL_NS2_MUX=y
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_PINCTRL_PFC_EMEV2=y
 CONFIG_PINCTRL_PFC_R8A7740=y
+CONFIG_PINCTRL_PFC_R8A7743=y
+CONFIG_PINCTRL_PFC_R8A7745=y
 CONFIG_PINCTRL_PFC_R8A7778=y
 CONFIG_PINCTRL_PFC_R8A7779=y
 CONFIG_PINCTRL_PFC_R8A7790=y
@@ -6419,6 +6522,7 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
 CONFIG_PINCTRL_QDF2XXX=m
 CONFIG_PINCTRL_ROCKCHIP=y
+CONFIG_PINCTRL_RZA1=y
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_SH_PFC=y
 CONFIG_PINCTRL_SH_PFC_GPIO=y
@@ -6641,6 +6745,7 @@ CONFIG_PSERIES_ENERGY=m
 # CONFIG_PSTORE_LZO_COMPRESS is not set
 # CONFIG_PSTORE_PMSG is not set
 CONFIG_PSTORE_ZLIB_COMPRESS=y
+CONFIG_PTP_1588_CLOCK_DTE=m
 CONFIG_PTP_1588_CLOCK_GIANFAR=m
 CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_PCH=m
@@ -6680,7 +6785,10 @@ CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
 CONFIG_PXA168_ETH=m
 CONFIG_QCA7000=m
+CONFIG_QCA7000_SPI=m
+CONFIG_QCA7000_UART=m
 CONFIG_QCOM_ADSP_PIL=m
+CONFIG_QCOM_APCS_IPC=m
 CONFIG_QCOM_BAM_DMA=m
 CONFIG_QCOM_CLK_RPM=m
 CONFIG_QCOM_CLK_SMD_RPM=m
@@ -6748,6 +6856,8 @@ CONFIG_QORIQ_THERMAL=m
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
 CONFIG_QSEMI_PHY=m
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PEARL_PCIE=m
 # CONFIG_QUEUED_LOCK_STAT is not set
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
@@ -6795,6 +6905,7 @@ CONFIG_RAID_ATTRS=m
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MEMORY=y
 CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_RAPIDIO=y
 CONFIG_RAPIDIO_CHMAN=m
 CONFIG_RAPIDIO_CPS_GEN2=m
@@ -6851,6 +6962,7 @@ CONFIG_REBOOT_MODE=m
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_ENC8=y
+# CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP=y
 CONFIG_REGMAP_AC97=m
 CONFIG_REGMAP_I2C=y
@@ -6884,6 +6996,7 @@ CONFIG_REGULATOR_DA9211=m
 CONFIG_REGULATOR_FAN53555=m
 CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_HI6421V530=m
 CONFIG_REGULATOR_HI655X=m
 CONFIG_REGULATOR_ISL6271A=m
 CONFIG_REGULATOR_ISL9305=m
@@ -6893,6 +7006,7 @@ CONFIG_REGULATOR_LP3972=m
 CONFIG_REGULATOR_LP872X=m
 CONFIG_REGULATOR_LP873X=m
 CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LP87565=m
 CONFIG_REGULATOR_LP8788=m
 CONFIG_REGULATOR_LTC3589=m
 CONFIG_REGULATOR_LTC3676=m
@@ -6972,9 +7086,11 @@ CONFIG_RENESAS_DMA=y
 CONFIG_RENESAS_INTC_IRQPIN=y
 CONFIG_RENESAS_IRQC=y
 CONFIG_RENESAS_OSTM=y
+CONFIG_RENESAS_RZAWDT=m
 CONFIG_RENESAS_USB_DMAC=m
 CONFIG_RENESAS_WDT=m
 # CONFIG_RESET_ATH79 is not set
+# CONFIG_RESET_GEMINI is not set
 CONFIG_RESET_HISI=y
 # CONFIG_RESET_LPC18XX is not set
 # CONFIG_RESET_PISTACHIO is not set
@@ -6982,6 +7098,7 @@ CONFIG_RESET_HISI=y
 # CONFIG_RESET_STM32 is not set
 # CONFIG_RESET_SUNXI is not set
 # CONFIG_RESET_TEGRA_BPMP is not set
+CONFIG_RESET_TI_SYSCON=m
 CONFIG_RESET_UNIPHIER=m
 # CONFIG_RESET_ZYNQ is not set
 CONFIG_RETU_WATCHDOG=m
@@ -7035,6 +7152,7 @@ CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
 CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPMSG_VIRTIO=m
 CONFIG_RPR0521=m
@@ -7043,6 +7161,7 @@ CONFIG_RSI_91X=m
 # CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
+CONFIG_RST_RCAR=y
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT2500USB=m
@@ -7086,6 +7205,7 @@ CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_BRCMSTB=m
 CONFIG_RTC_DRV_CPCAP=m
 CONFIG_RTC_DRV_DA9052=m
 CONFIG_RTC_DRV_DA9055=m
@@ -7113,9 +7233,11 @@ CONFIG_RTC_DRV_DS1742=m
 # CONFIG_RTC_DRV_DS17885 is not set
 CONFIG_RTC_DRV_DS2404=m
 CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
 CONFIG_RTC_DRV_EFI=y
 CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_FTRTC010=m
 CONFIG_RTC_DRV_GENERIC=y
 CONFIG_RTC_DRV_HID_SENSOR_TIME=m
 CONFIG_RTC_DRV_HYM8563=m
@@ -7200,6 +7322,7 @@ CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTL8180=m
@@ -7264,6 +7387,7 @@ CONFIG_SATA_AHCI_SEATTLE=m
 CONFIG_SATA_DWC=m
 # CONFIG_SATA_DWC_DEBUG is not set
 CONFIG_SATA_DWC_OLD_DMA=y
+CONFIG_SATA_GEMINI=m
 CONFIG_SATA_HIGHBANK=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
@@ -7319,7 +7443,6 @@ CONFIG_SCLP_TTY=y
 CONFIG_SCLP_VT220_CONSOLE=y
 CONFIG_SCLP_VT220_TTY=y
 CONFIG_SCM_BLOCK=m
-CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 CONFIG_SCM_BUS=y
 CONFIG_SCOM_DEBUGFS=y
 CONFIG_SCR24X=m
@@ -7346,6 +7469,7 @@ CONFIG_SCSI_FLASHPOINT=y
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_GENERIC_NCR5380=m
 CONFIG_SCSI_HISI_SAS=m
+CONFIG_SCSI_HISI_SAS_PCI=m
 CONFIG_SCSI_IBMVFC=m
 CONFIG_SCSI_IBMVFC_TRACE=y
 CONFIG_SCSI_IBMVSCSI=m
@@ -7413,6 +7537,7 @@ CONFIG_SCx200_WDT=m
 CONFIG_SDIO_UART=m
 CONFIG_SDLA=m
 # CONFIG_SDMA_VERBOSITY is not set
+CONFIG_SDR_PLATFORM_DRIVERS=y
 CONFIG_SEALEVEL_4021=m
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
@@ -7425,9 +7550,8 @@ CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 # CONFIG_SECURITY_APPARMOR_DEBUG is not set
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_STATS is not set
-CONFIG_SECURITY_APPARMOR_UNCONFINED_INIT=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY_INFINIBAND=y
 # CONFIG_SECURITY_LOADPIN is not set
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
@@ -7522,6 +7646,7 @@ CONFIG_SENSORS_IIO_HWMON=m
 CONFIG_SENSORS_INA209=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_IR35221=m
 CONFIG_SENSORS_ISL29018=m
 CONFIG_SENSORS_ISL29028=m
 CONFIG_SENSORS_IT87=m
@@ -7635,6 +7760,7 @@ CONFIG_SENSORS_WM8350=m
 CONFIG_SENSORS_XGENE=m
 CONFIG_SENSORS_ZL6100=m
 CONFIG_SERIAL_8250_ACCENT=m
+CONFIG_SERIAL_8250_ASPEED_VUART=m
 # CONFIG_SERIAL_8250_BCM2835AUX is not set
 CONFIG_SERIAL_8250_BOCA=m
 CONFIG_SERIAL_8250_CONSOLE=y
@@ -7691,6 +7817,8 @@ CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
+CONFIG_SERIAL_OWL=y
+CONFIG_SERIAL_OWL_CONSOLE=y
 CONFIG_SERIAL_PCH_UART=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_SAMSUNG=m
@@ -7758,6 +7886,7 @@ CONFIG_SKY2=m
 # CONFIG_SLAB is not set
 CONFIG_SLABINFO=y
 CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLHC=y
 CONFIG_SLICOSS=m
 CONFIG_SLIC_DS26522=m
@@ -7815,6 +7944,8 @@ CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_AU8810=m
 CONFIG_SND_AU8820=m
 CONFIG_SND_AU8830=m
+CONFIG_SND_AUDIO_GRAPH_CARD=m
+CONFIG_SND_AUDIO_GRAPH_SCU_CARD=m
 CONFIG_SND_AW2=m
 CONFIG_SND_AZT1605=m
 CONFIG_SND_AZT2316=m
@@ -7981,7 +8112,6 @@ CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_PPC=y
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_RAWMIDI=m
-CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_RIPTIDE=m
 CONFIG_SND_RME32=m
 CONFIG_SND_RME96=m
@@ -7995,12 +8125,17 @@ CONFIG_SND_SB16_DSP=m
 CONFIG_SND_SB8=m
 CONFIG_SND_SB8_DSP=m
 CONFIG_SND_SBAWE=m
+CONFIG_SND_SBAWE_SEQ=m
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SC6000=m
 CONFIG_SND_SEQUENCER=m
 # CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_VIRMIDI=m
 CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
@@ -8052,6 +8187,7 @@ CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES8316=m
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
@@ -8089,12 +8225,15 @@ CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_HASWELL=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
@@ -8142,6 +8281,7 @@ CONFIG_SND_SOC_RL6347A=m
 CONFIG_SND_SOC_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP_I2S=m
 CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
+CONFIG_SND_SOC_ROCKCHIP_PDM=m
 CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 CONFIG_SND_SOC_RT286=m
@@ -8153,6 +8293,7 @@ CONFIG_SND_SOC_RT5631=m
 CONFIG_SND_SOC_RT5640=m
 CONFIG_SND_SOC_RT5645=m
 CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5663=m
 CONFIG_SND_SOC_RT5670=m
 CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_SAMSUNG=m
@@ -8235,6 +8376,7 @@ CONFIG_SND_SOC_WM9712=m
 CONFIG_SND_SOC_WM_ADSP=m
 CONFIG_SND_SOC_WM_HUBS=m
 CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_SND_SOC_ZX_AUD96P22=m
 CONFIG_SND_SONICVIBES=m
 CONFIG_SND_SPI=y
 CONFIG_SND_SSCAPE=m
@@ -8243,6 +8385,7 @@ CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_ACPI=m
 CONFIG_SND_SST_IPC_PCI=m
 CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_SYNTH_EMUX=m
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB=y
 CONFIG_SND_USB_6FIRE=m
@@ -8314,11 +8457,13 @@ CONFIG_SOC_IMX7D=y
 # CONFIG_SOC_LS1021A is not set
 CONFIG_SOC_OMAP3430=y
 # CONFIG_SOC_OMAP5 is not set
+CONFIG_SOC_RENESAS=y
 CONFIG_SOC_SAMSUNG=y
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 CONFIG_SOC_TEGRA_PMC=y
 CONFIG_SOC_TI81XX=y
 CONFIG_SOC_VF610=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
 CONFIG_SONYPI=m
@@ -8337,7 +8482,6 @@ CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSE_IRQ=y
-# CONFIG_SPARSE_RCU_POINTER is not set
 CONFIG_SPEAKUP=m
 CONFIG_SPEAKUP_SYNTH_ACNTPC=m
 CONFIG_SPEAKUP_SYNTH_ACNTSA=m
@@ -8383,6 +8527,7 @@ CONFIG_SPI_INTEL_SPI_PLATFORM=m
 CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_LOOPBACK_TEST=m
 CONFIG_SPI_MASTER=y
+CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
 CONFIG_SPI_MT65XX=m
 CONFIG_SPI_OC_TINY=m
@@ -8396,6 +8541,9 @@ CONFIG_SPI_S3C64XX=m
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SH_HSPI=m
 CONFIG_SPI_SH_MSIOF=m
+CONFIG_SPI_SLAVE=y
+CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPI_SLAVE_TIME=m
 CONFIG_SPI_SPIDEV=m
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
@@ -8513,6 +8661,16 @@ CONFIG_SYSCON_REBOOT_MODE=m
 CONFIG_SYSCTL=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSC_R8A7743=y
+CONFIG_SYSC_R8A7745=y
+CONFIG_SYSC_R8A7779=y
+CONFIG_SYSC_R8A7790=y
+CONFIG_SYSC_R8A7791=y
+CONFIG_SYSC_R8A7792=y
+CONFIG_SYSC_R8A7794=y
+CONFIG_SYSC_R8A7795=y
+CONFIG_SYSC_R8A7796=y
+CONFIG_SYSC_RCAR=y
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_SYSFS_SYSCALL=y
@@ -8622,6 +8780,7 @@ CONFIG_TEST_BPF=m
 CONFIG_TEST_FIRMWARE=m
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_LIST_SORT is not set
 CONFIG_TEST_LKM=m
@@ -8632,6 +8791,7 @@ CONFIG_TEST_POWER=m
 # CONFIG_TEST_SORT is not set
 CONFIG_TEST_STATIC_KEYS=m
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_SYSCTL is not set
 CONFIG_TEST_UDELAY=m
 CONFIG_TEST_USER_COPY=m
 # CONFIG_TEST_UUID is not set
@@ -8660,6 +8820,8 @@ CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THIN_ARCHIVES=y
+CONFIG_THP_SWAP=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_THREAD_SHIFT=14
 CONFIG_THRUSTMASTER_FF=y
@@ -8676,6 +8838,9 @@ CONFIG_TIGON3=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIMB_DMA=m
 CONFIG_TIMERFD=y
+CONFIG_TIMER_ACPI=y
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_PROBE=y
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
 CONFIG_TIPC=m
@@ -8683,6 +8848,8 @@ CONFIG_TIPC_MEDIA_IB=y
 CONFIG_TIPC_MEDIA_UDP=y
 CONFIG_TI_ADC081C=m
 CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC084S021=m
+CONFIG_TI_ADC108S102=m
 CONFIG_TI_ADC12138=m
 CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
@@ -8705,10 +8872,10 @@ CONFIG_TI_EMIF=m
 CONFIG_TI_PIPE3=m
 CONFIG_TI_SOC_THERMAL=m
 CONFIG_TI_ST=m
-CONFIG_TI_SYSCON_RESET=m
 CONFIG_TI_THERMAL=y
 CONFIG_TI_TLC4541=m
 CONFIG_TLAN=m
+CONFIG_TLS=m
 CONFIG_TMD_HERMES=m
 CONFIG_TMP006=m
 CONFIG_TMP007=m
@@ -8783,6 +8950,7 @@ CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_TOUCHSCREEN_SILEAD=m
 CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMFTS=m
 CONFIG_TOUCHSCREEN_STMPE=m
 CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
@@ -8839,7 +9007,7 @@ CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
 CONFIG_TRACE_CLOCK=y
-# CONFIG_TRACE_ENUM_MAP_FILE is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACING=y
@@ -8851,7 +9019,6 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_RCU_TRACE is not set
 CONFIG_TREE_SRCU=y
 CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_TRUSTED_KEYS=y
@@ -8890,6 +9057,7 @@ CONFIG_TYPEC=m
 CONFIG_TYPEC_FUSB302=m
 CONFIG_TYPEC_TCPCI=m
 CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_UCSI=m
 CONFIG_TYPHOON=m
 # CONFIG_U3_DART is not set
 # CONFIG_UACCESS_WITH_MEMCPY is not set
@@ -8903,7 +9071,7 @@ CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBSAN is not set
 CONFIG_UCB1400_CORE=m
 CONFIG_UCS2_STRING=y
-CONFIG_UCSI=m
+CONFIG_UCSI_ACPI=m
 # CONFIG_UDBG_RTAS_CONSOLE is not set
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
@@ -8923,6 +9091,7 @@ CONFIG_ULTRA=m
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_UNIPHIER_SYSTEM_BUS=y
+CONFIG_UNIPHIER_WATCHDOG=m
 CONFIG_UNISYSSPAR=y
 CONFIG_UNISYS_VISORBUS=m
 CONFIG_UNISYS_VISORHBA=m
@@ -8983,6 +9152,7 @@ CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_CONFIGFS_F_PRINTER=y
 CONFIG_USB_CONFIGFS_F_TCM=y
 CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y
 CONFIG_USB_CONFIGFS_F_UAC2=y
 CONFIG_USB_CONFIGFS_F_UVC=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
@@ -9059,6 +9229,7 @@ CONFIG_USB_F_SS_LB=m
 CONFIG_USB_F_SUBSET=m
 CONFIG_USB_F_TCM=m
 CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC1_LEGACY=m
 CONFIG_USB_F_UAC2=m
 CONFIG_USB_F_UVC=m
 CONFIG_USB_GADGETFS=m
@@ -9339,6 +9510,7 @@ CONFIG_USB_SL811_CS=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_HCD_ISO=y
 CONFIG_USB_SNP_CORE=m
+CONFIG_USB_SNP_UDC_PLAT=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_STORAGE=m
@@ -9370,6 +9542,7 @@ CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_USBNET=m
 CONFIG_USB_USS720=m
+CONFIG_USB_U_AUDIO=m
 CONFIG_USB_U_ETHER=m
 CONFIG_USB_U_SERIAL=m
 CONFIG_USB_VIDEO_CLASS=m
@@ -9400,13 +9573,13 @@ CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_USE_OF=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-# CONFIG_USE_THIN_ARCHIVES is not set
 CONFIG_UTS_NS=y
 CONFIG_UWB_HWA=m
 CONFIG_UWB_I1480U=m
 CONFIG_UWB_WHCI=m
 CONFIG_U_SERIAL_CONSOLE=y
 CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
 CONFIG_V4L2_MEM2MEM_DEV=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
@@ -9529,6 +9702,8 @@ CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_IMX=m
+CONFIG_VIDEO_IMX_CSI=m
+CONFIG_VIDEO_IMX_MEDIA=m
 CONFIG_VIDEO_IMX_VDOA=m
 CONFIG_VIDEO_IR_I2C=m
 CONFIG_VIDEO_IVTV=m
@@ -9545,6 +9720,7 @@ CONFIG_VIDEO_MSRLIST_HELPER=m
 CONFIG_VIDEO_MT9M111=m
 CONFIG_VIDEO_MT9M114=m
 CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_OMAP2_VOUT=m
 CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
@@ -9563,6 +9739,8 @@ CONFIG_VIDEO_PVRUSB2=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_QCOM_VENUS=m
+CONFIG_VIDEO_RCAR_DRIF=m
 CONFIG_VIDEO_RCAR_VIN=m
 CONFIG_VIDEO_RENESAS_FCP=m
 CONFIG_VIDEO_RENESAS_FDP1=m
@@ -9737,9 +9915,11 @@ CONFIG_W83977F_WDT=m
 CONFIG_WAFER_WDT=m
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_WANXL=m
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_WARN_DYNAMIC_STACK is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
 # CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
@@ -9798,6 +9978,7 @@ CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_WLAN_VENDOR_RSI=y
@@ -9812,6 +9993,7 @@ CONFIG_WM831X_POWER=m
 CONFIG_WM831X_WATCHDOG=m
 CONFIG_WM8350_POWER=m
 CONFIG_WM8350_WATCHDOG=m
+CONFIG_WMI_BMOF=m
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 # CONFIG_WQ_WATCHDOG is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 8d468f2bf697517f3eb9ef1bd563b4962c35d8d5..c3bdc69b1b3cb1ff3332e11a4d12b9e929d12e28 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -27,6 +27,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+# CONFIG_ARCH_WANTS_THP_SWAP is not set
 # CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 CONFIG_ARCNET=m
 CONFIG_ATA=y
@@ -72,6 +73,7 @@ CONFIG_CRAMFS=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
 # CONFIG_CXL_BASE is not set
+# CONFIG_CXL_LIB is not set
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DMADEVICES=y
@@ -86,6 +88,7 @@ CONFIG_DW_WATCHDOG=m
 CONFIG_ECHO=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EFI=y
+CONFIG_EFI_CAPSULE_LOADER=y
 CONFIG_EFI_DEV_PATH_PARSER=y
 CONFIG_EFS_FS=m
 # CONFIG_EM_TIMER_STI is not set
@@ -100,6 +103,7 @@ CONFIG_FB_BOOT_VESA_SUPPORT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_MACMODES is not set
+# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 CONFIG_FDDI=y
 CONFIG_FEALNX=m
 CONFIG_FIREWIRE=m
@@ -135,12 +139,12 @@ CONFIG_HSR=m
 CONFIG_HTC_PASIC3=m
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HWMON=y
+CONFIG_HWSPINLOCK=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_HYPERV_TSCPAGE is not set
 # CONFIG_HZ_100 is not set
 CONFIG_I2C=y
 # CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_SLAVE is not set
 CONFIG_I6300ESB_WDT=m
 CONFIG_IEEE802154=m
 CONFIG_IIO=m
@@ -270,7 +274,7 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=8
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
-CONFIG_NVMEM=m
+CONFIG_NVMEM=y
 CONFIG_N_GSM=m
 # CONFIG_OF is not set
 CONFIG_OMFS_FS=m
@@ -365,7 +369,6 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_PM8001=m
@@ -410,7 +413,6 @@ CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL4_LIB_SEQ=m
 CONFIG_SND_PCM=m
-CONFIG_SND_SBAWE_SEQ=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_I2C_AND_SPI=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 3b928bef9b698d954c207750523600a46b53fed3..2a2dfc5dbe6aa1a0bfe10b4cc05adaf286026f2f 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -13,8 +13,6 @@ CONFIG_ALTERA_TSE=m
 # CONFIG_AMD_XGBE_HAVE_ECC is not set
 CONFIG_AMIGA_PARTITION=y
 CONFIG_APPLICOM=m
-CONFIG_ARCH_HAS_ILOG2_U32=y
-CONFIG_ARCH_HAS_ILOG2_U64=y
 # CONFIG_ARCH_HAS_STRICT_KERNEL_RWX is not set
 # CONFIG_ARCH_HAS_STRICT_MODULE_RWX is not set
 CONFIG_ARCH_MMAP_RND_BITS=28
@@ -29,6 +27,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+# CONFIG_ARCH_WANTS_THP_SWAP is not set
 # CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 CONFIG_ARCNET=m
 CONFIG_ATA=y
@@ -77,6 +76,7 @@ CONFIG_CRAMFS=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 CONFIG_CXL_AFU_DRIVER_OPS=y
 CONFIG_CXL_BASE=y
+CONFIG_CXL_LIB=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DMADEVICES=y
@@ -103,6 +103,7 @@ CONFIG_FB=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_FB_MACMODES=y
+# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 CONFIG_FDDI=y
 CONFIG_FEALNX=m
 CONFIG_FIREWIRE=m
@@ -139,6 +140,7 @@ CONFIG_HSR=m
 CONFIG_HTC_PASIC3=m
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HWMON=y
+CONFIG_HWSPINLOCK=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_HYPERV_TSCPAGE is not set
 CONFIG_HZ=250
@@ -146,7 +148,6 @@ CONFIG_HZ=250
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ_250=y
 CONFIG_I2C=y
-# CONFIG_I2C_SLAVE is not set
 CONFIG_I6300ESB_WDT=m
 CONFIG_IEEE802154=m
 CONFIG_IIO=m
@@ -282,7 +283,7 @@ CONFIG_NR_CPUS=2048
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_NVMEM=m
+CONFIG_NVMEM=y
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
@@ -373,7 +374,6 @@ CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_PM8001=m
@@ -417,7 +417,6 @@ CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_EMU10K1_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 CONFIG_SND_PCM=m
-# CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_I2C_AND_SPI=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 13df8ff059d4355faff25cfd1db767df817824de..0ad5d174fa4c9ebc0b9db7ff522933e7bb35c96f 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -11,14 +11,13 @@ CONFIG_64BIT=y
 # CONFIG_ALTERA_TSE is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_APPLICOM is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANTS_UBSAN_NO_NULL=y
 # CONFIG_ARCNET is not set
 # CONFIG_ATA is not set
@@ -64,6 +63,7 @@ CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
 # CONFIG_CXL_BASE is not set
+# CONFIG_CXL_LIB is not set
 # CONFIG_DECNET is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_DMADEVICES is not set
@@ -116,6 +116,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HTC_PASIC3 is not set
 CONFIG_HUGETLB_PAGE=y
 # CONFIG_HWMON is not set
+# CONFIG_HWSPINLOCK is not set
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HYPERV_TSCPAGE is not set
 CONFIG_HZ=100
@@ -257,7 +258,7 @@ CONFIG_PCIEPORTBUS=y
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_QUIRKS is not set
 # CONFIG_PCMCIA is not set
-CONFIG_PGTABLE_LEVELS=4
+CONFIG_PGTABLE_LEVELS=5
 # CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_PHANTOM is not set
 # CONFIG_PHONET is not set
@@ -318,7 +319,6 @@ CONFIG_SCHED_SMT=y
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_LPFC is not set
-CONFIG_SCSI_MQ_DEFAULT=y
 # CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_MVUMI is not set
 # CONFIG_SCSI_PM8001 is not set

diff --git a/dropped.txt b/dropped.txt
index 43cd9d784fe4d1eb8e7b9478ca59c1769bc91b5e..6a71305f616b47cc1629c09d50b773bcd205ee1d 100644 (file)
--- a/dropped.txt
+++ b/dropped.txt
@@ -1,5 +1,35 @@
 This is the list of patches/features which have been temporarily
 reverted or disabled for AA:
 
+aufs
+
+securityfs: update interface to allow inode_ops, and setup from vfs fns
+ - I think this is superseded
+UBUNTU: SAUCE: (no-up) include/linux/security.h -- fix syntax error with CONFIG_SECURITYFS=n
+ - Fix for ^
+UBUNTU: SAUCE: securityfs: Replace CURRENT_TIME with current_time()
+ - Perhaps also a fix for ^
+UBUNTU: SAUCE: Return TCMU-generated sense data to fabric module
+
+apparmor (I suspect many of these went upstream):
+ apparmor: sync of apparmor 3.6+ (17.04)
+ UBUNTU: SAUCE: apparmor: fix label parse for stacked labels
+ UBUNTU: SAUCE: apparmor: add information about the query inteface to the feature set
+ UBUNTU: SAUCE: apparmor: add label data availability to the feature set
+ UBUNTU: SAUCE: apparmor: add policy revision file interface
+ apparmor: provide information about path buffer size at boot
+ UBUNTU: SAUCE: apparmor: fix complain mode failure for rlimit mediation
+ apparmor: update auditing of rlimit check to provide capability information
+ UBUNTU: SAUCE: apparmor: fix not handling error case when securityfs_pin_fs() fails
+ UBUNTU: SAUCE: apparmor: fix reference count leak when securityfs_setup_d_inode() fails
+ UBUNTU: SAUCE: apparmor: fix leak on securityfs pin count
+ UBUNTU: SAUCE: apparmor: fix lock ordering for mkdir
+
 Possibly no longer needed:
  UBUNTU: SAUCE: nbd: Only delay uevent until connected
+
+Review:
+ UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements for unreleased firmware
+ UBUNTU: SAUCE: Fix FTBS in proc_version_signature
+ UBUNTU: SAUCE: export some symbols for powerpc
+ UBUNTU: SAUCE: cred: Add clone_cred() interface