UBUNTU: rebase to v5.0-rc2

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

diff --git a/debian.master/changelog b/debian.master/changelog
index 9add12c247d0559c3e72a03883b3c09f2418f91a..e6bb7fdc402b5efc355d1aec01a369755f447c24 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -4,6 +4,10 @@ linux (5.0.0-0.1) UNRELEASED; urgency=medium
   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 v5.0-rc2
+
  -- Seth Forshee <seth.forshee@canonical.com>  Wed, 16 Jan 2019 14:48:43 -0600
 
 linux (5.0.0-0.0) disco; urgency=medium

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index e6503221e70fc15e32f6dd77ede3e1509f462cc7..591f639b038cd8c50f115291faf9b5938e802286 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -64,7 +64,6 @@ CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_DMADEVICES=y
 # CONFIG_DMA_CMA is not set
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 # CONFIG_DM_DEBUG is not set
@@ -129,6 +128,9 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_AMD_MP2=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_SLAVE is not set
 CONFIG_I6300ESB_WDT=m
@@ -163,10 +165,8 @@ CONFIG_LAPB=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
-CONFIG_LOCK_DOWN_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
 CONFIG_MACB=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
@@ -187,14 +187,18 @@ CONFIG_MEMORY=y
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMSTICK=m
 CONFIG_MEM_SOFT_DIRTY=y
-CONFIG_MFD_CORE=y
+CONFIG_MFD_DA9063=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
 CONFIG_MFD_MADERA=m
+CONFIG_MFD_MAX14577=y
+CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -269,7 +273,6 @@ CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NVMEM=y
 CONFIG_N_GSM=m
 # CONFIG_OF is not set
 CONFIG_OMFS_FS=m
@@ -325,8 +328,8 @@ CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_REED_SOLOMON=m
 # CONFIG_REFCOUNT_FULL is not set
+CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPMI=m
-CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_TWL4030=m
@@ -393,10 +396,12 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
+CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SLHC=y
 CONFIG_SLIP=m
 CONFIG_SND=m
 CONFIG_SND_COMPRESS_OFFLOAD=m

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 207af56603788bb131c917ab8d1f64f0ecd38905..1561967d6a13440528a8fec8e5440f13821a7a5d 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -526,8 +526,8 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST               policy<{'amd64': '""', 'arm64':
 CONFIG_EFI_SIGNATURE_LIST_PARSER                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y'}>
 CONFIG_LOAD_UEFI_KEYS                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y'}>
 #
-CONFIG_EFI_SIGNATURE_LIST_PARSER                mark<ENFORCED>
-CONFIG_LOAD_UEFI_KEYS                           mark<ENFORCED>
+#CONFIG_EFI_SIGNATURE_LIST_PARSER                mark<ENFORCED>
+#CONFIG_LOAD_UEFI_KEYS                           mark<ENFORCED>
 CONFIG_SYSTEM_BLACKLIST_KEYRING                 mark<ENFORCED>
 
 # Menu: Cryptographic API >> Certificates for signature checking >> Provide system-wide ring of trusted keys
@@ -10215,7 +10215,7 @@ CONFIG_XZ_DEC                                   note<boot essential -- initramfs
 # Menu: Memory Management options
 CONFIG_SPARSEMEM_VMEMMAP                        policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_MEMORY_HOTPLUG                           policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE            policy<{'amd64': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'y'}>
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE            policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'y'}>
 CONFIG_MEMORY_HOTREMOVE                         policy<{'amd64': 'y', 'i386': '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'}>
@@ -11944,9 +11944,9 @@ CONFIG_LOCK_DOWN_MANDATORY                      policy<{'amd64': 'n', 'arm64': '
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ             policy<{'amd64': 'y', 'i386': 'y'}>
 CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y'}>
 #
-CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ             mark<ENFORCED>
-CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT             mark<ENFORCED>
-CONFIG_LOCK_DOWN_KERNEL                         mark<ENFORCED> flag<REVIEW>
+#CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ             mark<ENFORCED>
+#CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT             mark<ENFORCED>
+#CONFIG_LOCK_DOWN_KERNEL                         mark<ENFORCED> flag<REVIEW>
 
 # Menu: Security options >> Default security module
 CONFIG_DEFAULT_SECURITY_SELINUX                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index a7755ec1d36e34668bb2b8f5209df994313abf38..9fc8fec468cd91c90447605b93cff308cc55b029 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -23,6 +23,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 # CONFIG_ARCH_MVEBU is not set
+CONFIG_ARCH_MXC=y
 # CONFIG_ARCH_ROCKCHIP is not set
 CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_TEGRA is not set
@@ -72,8 +73,7 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 # CONFIG_DEBUG_ALIGN_RODATA is not set
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
-CONFIG_DMADEVICES=y
-# CONFIG_DMA_CMA is not set
+CONFIG_DMA_CMA=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 # CONFIG_DM_DEBUG is not set
 CONFIG_DNET=m
@@ -135,6 +135,9 @@ CONFIG_HZ=250
 CONFIG_HZ_250=y
 CONFIG_I2C=y
 # CONFIG_I2C_AMD_MP2 is not set
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_IMX=m
 CONFIG_I2C_SLAVE=y
@@ -164,16 +167,15 @@ CONFIG_JFS_FS=m
 CONFIG_JME=m
 CONFIG_JUMP_LABEL=y
 CONFIG_KARMA_PARTITION=y
+CONFIG_KEXEC_FILE=y
 CONFIG_KVM=y
 CONFIG_LAPB=m
 # CONFIG_LATENCYTOP is not set
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
-CONFIG_LOCK_DOWN_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
 CONFIG_MACB=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
@@ -191,16 +193,21 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMSTICK=m
-CONFIG_MFD_CORE=y
+CONFIG_MFD_DA9063=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
 CONFIG_MFD_MADERA=m
+CONFIG_MFD_MAX14577=y
+CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_TPS65217=m
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MII=y
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -215,6 +222,8 @@ CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_BCH=m
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_PHYSMAP_GEMINI=y
+CONFIG_MTD_PHYSMAP_VERSATILE=y
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_ADAPTEC=y
@@ -270,7 +279,6 @@ CONFIG_NR_CPUS=256
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_NVMEM=y
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
@@ -281,6 +289,7 @@ CONFIG_PARAVIRT=y
 CONFIG_PARPORT=m
 CONFIG_PATA_SIS=m
 CONFIG_PC104=y
+CONFIG_PCCARD=m
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_PCI_LAYERSCAPE=y
@@ -321,7 +330,7 @@ CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_REED_SOLOMON=m
 CONFIG_REFCOUNT_FULL=y
-CONFIG_REGULATOR=y
+CONFIG_REGMAP_I2C=y
 CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_REISERFS_FS=m
@@ -374,6 +383,7 @@ CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_8250_FINTEK=y
 CONFIG_SERIAL_ALTERA_JTAGUART=m
@@ -382,20 +392,20 @@ CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_MCTRL_GPIO=m
+CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
+CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SLHC=y
 CONFIG_SLIP=m
 CONFIG_SMC91X=y
-CONFIG_SND_SOC_FSL_SSI=m
-CONFIG_SND_SOC_IMX_AUDMUX=m
-CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
 CONFIG_SOC_BRCMSTB=y
 CONFIG_SOC_TI=y
 CONFIG_SOLARIS_X86_PARTITION=y

diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic
index 89e806d737d40c6fb870d11517b97f9ab20b4349..97c96649a735615b7023e02bf5a2f3317d5f60d1 100644 (file)
--- a/debian.master/config/arm64/config.flavour.generic
+++ b/debian.master/config/arm64/config.flavour.generic
@@ -19,6 +19,7 @@ CONFIG_INPUT_PM8941_PWRKEY=m
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MSM_GCC_8916=m
@@ -51,17 +52,23 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_SND=m
 CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_IMX_SOC=m
 CONFIG_SND_PCM=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_APQ8016_SBC=m
+CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_SOC_IMX_PCM_DMA=m
+CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_LPASS_APQ8016=m
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
 CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_QCOM=m
+CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_TIMER=m
 CONFIG_SOUND=m
 CONFIG_SPI_QUP=m

diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon
index 8d51a10f983f59227e91b8c0258d9c37f1e472ff..77e22e6f1ee9922d2ff193f98d1a80f34bb162b1 100644 (file)
--- a/debian.master/config/arm64/config.flavour.snapdragon
+++ b/debian.master/config/arm64/config.flavour.snapdragon
@@ -19,6 +19,7 @@ CONFIG_INPUT_PM8941_PWRKEY=y
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_MFD_SPMI_PMIC=y
 CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_MSM=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MSM_GCC_8916=y
@@ -51,17 +52,23 @@ CONFIG_RPMSG=y
 CONFIG_RPMSG_QCOM_SMD=y
 CONFIG_SND=y
 CONFIG_SND_DMAENGINE_PCM=y
+CONFIG_SND_IMX_SOC=y
 CONFIG_SND_PCM=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_APQ8016_SBC=y
+CONFIG_SND_SOC_FSL_SSI=y
 CONFIG_SND_SOC_HDMI_CODEC=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
+CONFIG_SND_SOC_IMX_AUDMUX=y
+CONFIG_SND_SOC_IMX_PCM_DMA=y
+CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_SOC_LPASS_APQ8016=y
 CONFIG_SND_SOC_LPASS_CPU=y
 CONFIG_SND_SOC_LPASS_PLATFORM=y
 CONFIG_SND_SOC_MSM8916_WCD_ANALOG=y
 CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=y
 CONFIG_SND_SOC_QCOM=y
+CONFIG_SND_SOC_SGTL5000=y
 CONFIG_SND_TIMER=y
 CONFIG_SOUND=y
 CONFIG_SPI_QUP=y

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 30485850c20bfcad49302f524787b62285a619a0..080ba55967b690db05f4d71dbc8e3b11860a8316 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -67,7 +67,6 @@ CONFIG_CRYPTO_DEFLATE=y
 CONFIG_DEBUG_ALIGN_RODATA=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
-CONFIG_DMADEVICES=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 # CONFIG_DM_DEBUG is not set
 CONFIG_DNET=m
@@ -136,6 +135,9 @@ CONFIG_HZ=250
 CONFIG_HZ_250=y
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_EMEV2=m
 CONFIG_I2C_IMX=y
 CONFIG_I2C_QUP=m
@@ -173,10 +175,8 @@ CONFIG_LAPB=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
-CONFIG_LOCK_DOWN_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
 CONFIG_MACB=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
@@ -195,16 +195,20 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
 CONFIG_MEMSTICK=m
-CONFIG_MFD_CORE=y
+CONFIG_MFD_DA9063=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
 CONFIG_MFD_MADERA=m
+CONFIG_MFD_MAX14577=y
+CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_SM501=y
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_TPS65217=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -212,6 +216,7 @@ CONFIG_MISC_RTSX_PCI=m
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MSM_GCC_8916=m
@@ -223,6 +228,8 @@ CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_BCH=y
 CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_PHYSMAP_GEMINI=y
+CONFIG_MTD_PHYSMAP_VERSATILE=y
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_ADAPTEC=y
@@ -276,7 +283,6 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=4
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
-CONFIG_NVMEM=y
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
@@ -348,8 +354,8 @@ CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_REED_SOLOMON=y
 CONFIG_REFCOUNT_FULL=y
+CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPMI=m
-CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
@@ -406,6 +412,7 @@ CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SERIAL_8250_DW=m
 # CONFIG_SERIAL_8250_FINTEK is not set
 CONFIG_SERIAL_ALTERA_JTAGUART=m
@@ -418,20 +425,25 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
+CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SLHC=y
 CONFIG_SLIP=m
 CONFIG_SMC91X=m
 CONFIG_SND=y
 CONFIG_SND_COMPRESS_OFFLOAD=y
 CONFIG_SND_DMAENGINE_PCM=y
+CONFIG_SND_IMX_SOC=y
 CONFIG_SND_PCM=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_APQ8016_SBC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=y
+CONFIG_SND_SOC_IMX_PCM_DMA=y
+CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_SOC_LPASS_APQ8016=m
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m

diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic
index a70b288cce1984f7cbda31d6e51944b36e9700be..295c875a51e6f88be066891e5043b22d51d86dc8 100644 (file)
--- a/debian.master/config/armhf/config.flavour.generic
+++ b/debian.master/config/armhf/config.flavour.generic
@@ -17,7 +17,6 @@ CONFIG_PWM_TIEHRPWM=m
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_RTC_DRV_PCF8523=y
 CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SND_EDMA_SOC=m
 CONFIG_SND_SOC_FSL_SSI=y
 CONFIG_SND_SOC_IMX_AUDMUX=y
 CONFIG_SND_SOC_SGTL5000=y

diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae
index 2f8b7c09437c10cef54d4b3c0f80abcaa61080ef..1c577cca424f1a7f91e949e14e628c9e22c69617 100644 (file)
--- a/debian.master/config/armhf/config.flavour.generic-lpae
+++ b/debian.master/config/armhf/config.flavour.generic-lpae
@@ -17,7 +17,6 @@ CONFIG_PGTABLE_LEVELS=3
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_SERIAL_MCTRL_GPIO=m
-# CONFIG_SND_EDMA_SOC is not set
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_SGTL5000=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c495ff7353f4d03ba8da3ece78e554fb166f8823..7d1db4a9aa4b11c65784b9f1a918f2da38613679 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -134,6 +134,7 @@ CONFIG_AD5761=m
 CONFIG_AD5764=m
 CONFIG_AD5791=m
 CONFIG_AD5933=m
+CONFIG_AD7124=m
 CONFIG_AD7150=m
 CONFIG_AD7152=m
 CONFIG_AD7192=m
@@ -154,6 +155,7 @@ CONFIG_AD7793=m
 CONFIG_AD7816=m
 CONFIG_AD7887=m
 CONFIG_AD7923=m
+CONFIG_AD7949=m
 CONFIG_AD799X=m
 CONFIG_AD8366=m
 CONFIG_AD8801=m
@@ -245,7 +247,6 @@ CONFIG_ALIGNMENT_TRAP=y
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIX=y
 CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 CONFIG_ALPINE_MSI=y
 CONFIG_ALTERA_MBOX=m
 CONFIG_ALTERA_MSGDMA=m
@@ -356,7 +357,6 @@ CONFIG_ARCH_HAS_REFCOUNT=y
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_ARCH_HAS_SCALED_CPUTIME=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
@@ -475,6 +475,8 @@ CONFIG_ARCH_R9A06G032=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_ARCH_RCAR_GEN1=y
 CONFIG_ARCH_RCAR_GEN2=y
+CONFIG_ARCH_RCAR_GEN3=y
+CONFIG_ARCH_RDA=y
 CONFIG_ARCH_REALTEK=y
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_RENESAS=y
@@ -568,6 +570,7 @@ CONFIG_ARM64_CNP=y
 CONFIG_ARM64_CONT_SHIFT=4
 CONFIG_ARM64_CRYPTO=y
 CONFIG_ARM64_ERRATUM_1024718=y
+CONFIG_ARM64_ERRATUM_1165522=y
 CONFIG_ARM64_ERRATUM_1188873=y
 CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_819472=y
@@ -589,6 +592,7 @@ CONFIG_ARM64_PA_BITS_48=y
 CONFIG_ARM64_PMEM=y
 CONFIG_ARM64_PTDUMP_CORE=y
 # CONFIG_ARM64_PTDUMP_DEBUGFS is not set
+CONFIG_ARM64_PTR_AUTH=y
 # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
 CONFIG_ARM64_RAS_EXTN=y
 # CONFIG_ARM64_RELOC_TEST is not set
@@ -600,6 +604,7 @@ CONFIG_ARM64_VA_BITS=48
 # CONFIG_ARM64_VA_BITS_39 is not set
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_ARM64_VHE=y
+CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
 CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
 CONFIG_ARMADA375_USBCLUSTER_PHY=y
 CONFIG_ARMADA_370_CLK=y
@@ -686,6 +691,7 @@ CONFIG_ARM_PSCI=y
 CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_PTDUMP_CORE=y
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
+CONFIG_ARM_QCOM_CPUFREQ_HW=m
 CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SBSA_WATCHDOG=m
@@ -826,8 +832,6 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_AUDIT_COMPAT_GENERIC=y
 CONFIG_AUDIT_GENERIC=y
-CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_WATCH=y
 CONFIG_AUFS_BDEV_LOOP=y
 # CONFIG_AUFS_BRANCH_MAX_1023 is not set
 CONFIG_AUFS_BRANCH_MAX_127=y
@@ -934,6 +938,7 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BATMAN_ADV_BATMAN_V is not set
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
 # CONFIG_BATMAN_ADV_DEBUGFS is not set
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_NC=y
@@ -1059,7 +1064,6 @@ CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_MQ=y
-# CONFIG_BLK_WBT_SQ is not set
 CONFIG_BLOCK=y
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BL_SWITCHER=y
@@ -1294,7 +1298,6 @@ CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 CONFIG_CAN_XILINXCAN=m
 CONFIG_CAPI_AVM=y
-CONFIG_CAPI_EICON=y
 CONFIG_CAPI_TRACE=y
 CONFIG_CARDBUS=y
 CONFIG_CARDMAN_4000=m
@@ -1320,12 +1323,15 @@ CONFIG_CCS811=m
 CONFIG_CCW=y
 CONFIG_CCWGROUP=m
 CONFIG_CCW_CONSOLE=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
 CONFIG_CC_IS_GCC=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_CDNS_I3C_MASTER=m
 CONFIG_CDROM=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -1353,7 +1359,6 @@ CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
 CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_BPF=y
@@ -1450,6 +1455,7 @@ CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_CLKSRC_EXYNOS_MCT=y
 CONFIG_CLKSRC_I8253=y
 CONFIG_CLKSRC_IMX_GPT=y
+CONFIG_CLKSRC_IMX_TPM=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLKSRC_QCOM=y
 CONFIG_CLKSRC_TI_32K=y
@@ -1459,6 +1465,8 @@ CONFIG_CLK_BCM_NS2=y
 CONFIG_CLK_BCM_SR=y
 CONFIG_CLK_EMEV2=y
 CONFIG_CLK_HSDK=y
+CONFIG_CLK_IMX8MQ=y
+CONFIG_CLK_IMX8QXP=y
 CONFIG_CLK_OWL_S700=y
 CONFIG_CLK_OWL_S900=y
 CONFIG_CLK_QORIQ=y
@@ -1670,6 +1678,7 @@ CONFIG_COMEDI_USB_DRIVERS=m
 CONFIG_COMEDI_VMK80XX=m
 CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_AMLOGIC=y
+CONFIG_COMMON_CLK_BD718XX=m
 CONFIG_COMMON_CLK_CDCE706=m
 CONFIG_COMMON_CLK_CDCE925=m
 CONFIG_COMMON_CLK_CS2000_CP=m
@@ -1703,6 +1712,9 @@ CONFIG_COMMON_CLK_MT7622=y
 CONFIG_COMMON_CLK_MT7622_AUDSYS=y
 CONFIG_COMMON_CLK_MT7622_ETHSYS=y
 CONFIG_COMMON_CLK_MT7622_HIFSYS=y
+CONFIG_COMMON_CLK_MT7629=y
+CONFIG_COMMON_CLK_MT7629_ETHSYS=y
+CONFIG_COMMON_CLK_MT7629_HIFSYS=y
 CONFIG_COMMON_CLK_MT8135=y
 CONFIG_COMMON_CLK_MT8173=y
 CONFIG_COMMON_CLK_PALMAS=m
@@ -1843,6 +1855,7 @@ CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_ADIANTUM=m
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_AEGIS128=m
@@ -2025,6 +2038,10 @@ CONFIG_CRYPTO_MORUS1280_SSE2=m
 CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_MORUS640_GLUE=m
 CONFIG_CRYPTO_MORUS640_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_NHPOLY1305_AVX2=m
+CONFIG_CRYPTO_NHPOLY1305_NEON=m
+CONFIG_CRYPTO_NHPOLY1305_SSE2=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_OFB=m
@@ -2077,6 +2094,8 @@ CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM3_ARM64_CE=m
 CONFIG_CRYPTO_SM4=m
 CONFIG_CRYPTO_SM4_ARM64_CE=m
+CONFIG_CRYPTO_STATS=y
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
@@ -2159,7 +2178,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-CONFIG_DEBUG_IMX_UART_PORT=1
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
@@ -2213,14 +2231,10 @@ CONFIG_DECOMPRESS_LZ4=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_XZ=y
-CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_IO_DELAY_TYPE=1
-# CONFIG_DEFAULT_NOOP is not set
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_SECURITY="apparmor"
 CONFIG_DEFAULT_SECURITY_APPARMOR=y
@@ -2279,6 +2293,7 @@ CONFIG_DLN2_ADC=m
 CONFIG_DM9000=m
 # CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set
 CONFIG_DM9102=m
+CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 CONFIG_DMARD06=m
 CONFIG_DMARD09=m
@@ -2288,12 +2303,13 @@ CONFIG_DMAR_TABLE=y
 CONFIG_DMA_ACPI=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_DMA_BCM2835=y
-CONFIG_DMA_DIRECT_OPS=y
+CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_ENGINE_RAID=y
 # CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_DMA_OF=y
 CONFIG_DMA_OMAP=y
+CONFIG_DMA_REMAP=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_SUN6I=m
 CONFIG_DMA_VIRT_OPS=y
@@ -2384,7 +2400,6 @@ CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_FIMC=y
 # CONFIG_DRM_EXYNOS_FIMD is not set
 CONFIG_DRM_EXYNOS_HDMI=y
-CONFIG_DRM_EXYNOS_IOMMU=y
 CONFIG_DRM_EXYNOS_IPP=y
 CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_EXYNOS_MIXER=y
@@ -2470,11 +2485,13 @@ CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
 CONFIG_DRM_PANEL_JDI_LT070ME05000=m
 CONFIG_DRM_PANEL_LG_LG4573=m
 CONFIG_DRM_PANEL_LVDS=m
+CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
+CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
@@ -2483,6 +2500,7 @@ CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
+CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_PL111=m
 CONFIG_DRM_QXL=m
@@ -2748,6 +2766,7 @@ CONFIG_DWC_XLGMAC_PCI=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MEDIATEK=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_SOCFPGA=m
@@ -2760,7 +2779,9 @@ CONFIG_DW_AXI_DMAC=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC_PCI=m
+CONFIG_DW_I3C_MASTER=m
 CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_DYNAMIC_MEMORY_LAYOUT=y
@@ -2817,6 +2838,7 @@ CONFIG_EDAC_R82600=m
 CONFIG_EDAC_SBRIDGE=m
 CONFIG_EDAC_SKX=m
 CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC_SYNOPSYS=m
 CONFIG_EDAC_THUNDERX=m
 CONFIG_EDAC_TI=m
 CONFIG_EDAC_X38=m
@@ -2848,7 +2870,6 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 CONFIG_EFI_RUNTIME_MAP=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_TEST=m
 CONFIG_EFI_VARS=y
@@ -2873,6 +2894,7 @@ CONFIG_ENC28J60=m
 # CONFIG_ENC28J60_WRITEVERIFY is not set
 CONFIG_ENCRYPTED_KEYS=y
 CONFIG_ENCX24J600=m
+# CONFIG_ENERGY_MODEL is not set
 CONFIG_ENIC=m
 CONFIG_ENVELOPE_DETECTOR=m
 CONFIG_EPAPR_BOOT=y
@@ -2982,7 +3004,7 @@ CONFIG_FB_ATY_BACKLIGHT=y
 CONFIG_FB_ATY_CT=y
 # CONFIG_FB_ATY_GENERIC_LCD is not set
 CONFIG_FB_ATY_GX=y
-CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_BACKLIGHT=m
 CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CARILLO_RANCH=m
 CONFIG_FB_CARMINE=m
@@ -3184,7 +3206,9 @@ CONFIG_FONT_ACORN_8x8=y
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_SUN8x16 is not set
 CONFIG_FONT_SUPPORT=y
+# CONFIG_FONT_TER16x32 is not set
 CONFIG_FORCEDETH=m
+CONFIG_FORCE_PCI=y
 CONFIG_FORCE_SMP=y
 CONFIG_FORTIFY_SOURCE=y
 CONFIG_FPGA=m
@@ -3198,6 +3222,7 @@ CONFIG_FPGA_MGR_ALTERA_CVP=m
 CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
 CONFIG_FPGA_MGR_ICE40_SPI=m
 CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_STRATIX10_SOC=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3217,6 +3242,7 @@ CONFIG_FSI=m
 CONFIG_FSI_MASTER_GPIO=m
 CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_NEW_DEV_NODE is not set
+CONFIG_FSI_OCC=m
 CONFIG_FSI_SBEFIFO=m
 CONFIG_FSI_SCOM=m
 CONFIG_FSL_BMAN_TEST=m
@@ -3256,6 +3282,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 CONFIG_FTRACE_SYSCALLS=y
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 CONFIG_FTWDT010_WATCHDOG=m
+CONFIG_FUEL_GAUGE_SC27XX=m
 CONFIG_FUJITSU_ES=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
@@ -3380,6 +3407,7 @@ CONFIG_GPIO_ARIZONA=m
 CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_BRCMSTB=m
 CONFIG_GPIO_BT8XX=m
+CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CRYSTAL_COVE=m
 CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_DA9052=m
@@ -3433,6 +3461,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_RCAR=m
 CONFIG_GPIO_RDC321X=m
+CONFIG_GPIO_SAMA5D2_PIOBU=m
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_SCH311X=m
 CONFIG_GPIO_SIOX=m
@@ -3525,6 +3554,7 @@ CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
@@ -3560,6 +3590,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_EBPF_JIT=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_EISA=y
 CONFIG_HAVE_EXIT_THREAD=y
 CONFIG_HAVE_FENTRY=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -3622,6 +3653,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_HAVE_NMI=y
 CONFIG_HAVE_NMI_WATCHDOG=y
@@ -3629,6 +3661,7 @@ CONFIG_HAVE_NOP_MCOUNT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_PATA_PLATFORM=y
+CONFIG_HAVE_PCI=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
@@ -3909,6 +3942,7 @@ CONFIG_HTS221=m
 CONFIG_HTS221_I2C=m
 CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
+CONFIG_HUAWEI_WMI=m
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
@@ -3987,7 +4021,6 @@ CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_BRCMSTB=m
 # CONFIG_I2C_CADENCE is not set
 CONFIG_I2C_CBUS_GPIO=m
-CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_CHT_WC=m
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=m
@@ -3996,9 +4029,7 @@ 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=y
 CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_DLN2=m
@@ -4079,6 +4110,7 @@ CONFIG_I2C_VIPERBOARD=m
 CONFIG_I2C_XGENE_SLIMPRO=m
 CONFIG_I2C_XILINX=m
 CONFIG_I2C_XLP9XX=m
+CONFIG_I3C=m
 CONFIG_I40E=m
 CONFIG_I40EVF=m
 CONFIG_I40E_DCB=y
@@ -4184,6 +4216,7 @@ CONFIG_IMA_APPRAISE=y
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
 # CONFIG_IMA_APPRAISE_SIGNED_INIT is not set
+# CONFIG_IMA_ARCH_POLICY is not set
 # CONFIG_IMA_BLACKLIST_KEYRING is not set
 # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
 CONFIG_IMA_KEXEC=y
@@ -4198,13 +4231,15 @@ CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der"
 CONFIG_IMG_ASCII_LCD=m
 CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
-CONFIG_IMX7_PM_DOMAINS=y
 CONFIG_IMX_DMA=m
 CONFIG_IMX_GPCV2=y
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_IPUV3_CORE=m
+CONFIG_IMX_IRQSTEER=y
 CONFIG_IMX_MBOX=m
 CONFIG_IMX_REMOTEPROC=m
 CONFIG_IMX_SCU=y
+CONFIG_IMX_SCU_PD=y
 CONFIG_IMX_SDMA=m
 CONFIG_IMX_THERMAL=m
 CONFIG_IMX_WEIM=y
@@ -4390,6 +4425,7 @@ CONFIG_INT340X_THERMAL=m
 CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
 CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_TRUSTED_KEYRING=y
 CONFIG_INTEL_ATOMISP2_PM=m
@@ -4429,7 +4465,6 @@ CONFIG_INTEL_PMC_IPC=m
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_INTEL_PUNIT_IPC=m
 CONFIG_INTEL_RAPL=m
-CONFIG_INTEL_RDT=y
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SCU_IPC=y
 CONFIG_INTEL_SCU_IPC_UTIL=m
@@ -4441,6 +4476,7 @@ CONFIG_INTEL_SOC_PMIC=y
 CONFIG_INTEL_SOC_PMIC_BXTWC=m
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 CONFIG_INTEL_SOC_PMIC_CHTWC=y
+CONFIG_INTEL_STRATIX10_SERVICE=m
 CONFIG_INTEL_TELEMETRY=m
 CONFIG_INTEL_TH=m
 CONFIG_INTEL_TH_ACPI=m
@@ -4471,9 +4507,6 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IOSCHED_BFQ=m
-CONFIG_IOSCHED_CFQ=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSF_MBI=y
 CONFIG_IOSF_MBI_DEBUG=y
 # CONFIG_IO_DELAY_0X80 is not set
@@ -4709,12 +4742,6 @@ CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_CAPIDRV=m
 # CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_USERIDI=m
 CONFIG_ISDN_DIVERSION=m
 CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
 CONFIG_ISDN_DRV_AVMB1_B1ISA=m
@@ -4855,6 +4882,7 @@ CONFIG_KERNFS=y
 CONFIG_KEXEC=y
 CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
 CONFIG_KEXEC_CORE=y
+# CONFIG_KEXEC_IMAGE_VERIFY_SIG is not set
 CONFIG_KEXEC_JUMP=y
 CONFIG_KEXEC_VERIFY_SIG=y
 CONFIG_KEYBOARD_ADC=m
@@ -5052,6 +5080,7 @@ CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_LEDS_TRIGGER_CPU=y
@@ -5104,7 +5133,6 @@ CONFIG_LIRC=y
 CONFIG_LIVEPATCH=y
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
@@ -5112,8 +5140,6 @@ CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
-# CONFIG_LOCK_DOWN_MANDATORY is not set
 CONFIG_LOCK_SPIN_ON_OWNER=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
@@ -5126,6 +5152,7 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_LP8788_ADC=m
 CONFIG_LPARCFG=y
+CONFIG_LPC_SCH=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_LRU_CACHE=m
 CONFIG_LSI_ET1011C_PHY=m
@@ -5198,6 +5225,7 @@ CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_MAC_EMUMOUSEBTN=m
+CONFIG_MADERA_IRQ=m
 CONFIG_MAG3110=m
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
@@ -5247,6 +5275,7 @@ CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 CONFIG_MCP3911=m
 CONFIG_MCP4018=m
+CONFIG_MCP41010=m
 CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP4725=m
@@ -5366,6 +5395,7 @@ CONFIG_MEN_A21_WDT=m
 CONFIG_MEN_Z188_ADC=m
 CONFIG_MESON6_TIMER=y
 CONFIG_MESON_CANVAS=m
+CONFIG_MESON_CLK_MEASURE=y
 CONFIG_MESON_GXBB_WATCHDOG=m
 CONFIG_MESON_GXL_PHY=m
 CONFIG_MESON_GX_PM_DOMAINS=y
@@ -5396,6 +5426,7 @@ CONFIG_MFD_AXP20X_I2C=m
 CONFIG_MFD_AXP20X_RSB=m
 CONFIG_MFD_BCM590XX=m
 CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_CORE=y
 CONFIG_MFD_CPCAP=m
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_CHARDEV=m
@@ -5408,7 +5439,6 @@ CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_DA9055=y
 CONFIG_MFD_DA9062=m
-CONFIG_MFD_DA9063=y
 CONFIG_MFD_DA9150=m
 CONFIG_MFD_DLN2=m
 CONFIG_MFD_EXYNOS_LPASS=m
@@ -5424,10 +5454,8 @@ CONFIG_MFD_LP3943=m
 CONFIG_MFD_LP8788=y
 CONFIG_MFD_MADERA_I2C=m
 CONFIG_MFD_MADERA_SPI=m
-CONFIG_MFD_MAX14577=y
 CONFIG_MFD_MAX77620=y
 CONFIG_MFD_MAX77686=y
-CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MAX77843=y
 CONFIG_MFD_MAX8907=m
 CONFIG_MFD_MAX8925=y
@@ -5473,8 +5501,6 @@ CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS65218=m
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MFD_TPS65912_SPI=y
 CONFIG_MFD_TPS68470=y
 CONFIG_MFD_TPS80031=y
@@ -5498,8 +5524,6 @@ 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_MICROCHIP_T1_PHY=m
 CONFIG_MICROCODE=y
@@ -5509,9 +5533,9 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_MICROSEMI_PHY=m
 CONFIG_MIC_COSM=m
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
-CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_MIGRATE_VMA_HELPER=y
 CONFIG_MIGRATION=y
+CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MISC_RTSX=m
 CONFIG_MISC_RTSX_USB=m
@@ -5578,6 +5602,7 @@ CONFIG_MMA9551_CORE=m
 CONFIG_MMA9553=m
 CONFIG_MMC35240=m
 CONFIG_MMCONF_FAM10H=y
+CONFIG_MMC_ALCOR=m
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_BCM2835=m
 CONFIG_MMC_BLOCK_MINORS=8
@@ -5605,11 +5630,11 @@ CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_AM654=m
 CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER=y
 CONFIG_MMC_SDHCI_BRCMSTB=m
 CONFIG_MMC_SDHCI_CADENCE=m
 CONFIG_MMC_SDHCI_DOVE=m
-CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_F_SDH30=m
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_IPROC=m
@@ -5794,13 +5819,11 @@ CONFIG_MTD_DATAFLASH_OTP=y
 # CONFIG_MTD_DOCG3 is not set
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_GPIO_ADDR=m
 CONFIG_MTD_ICHXROM=m
 CONFIG_MTD_IMPA7=m
 CONFIG_MTD_INTEL_VR_NOR=m
 CONFIG_MTD_JEDECPROBE=m
 CONFIG_MTD_L440GX=m
-CONFIG_MTD_LATCH_ADDR=m
 CONFIG_MTD_LPDDR=m
 CONFIG_MTD_LPDDR2_NVM=m
 CONFIG_MTD_M25P80=m
@@ -5857,9 +5880,8 @@ CONFIG_MTD_PCMCIA=m
 CONFIG_MTD_PHRAM=m
 CONFIG_MTD_PHYSMAP=m
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_MTD_PHYSMAP_OF_GEMINI=y
-CONFIG_MTD_PHYSMAP_OF_VERSATILE=y
+CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
+CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_PLATRAM=m
 CONFIG_MTD_PMC551=m
 # CONFIG_MTD_PMC551_BUGFIX is not set
@@ -5878,8 +5900,6 @@ CONFIG_MTD_SCx200_DOCFLASH=m
 CONFIG_MTD_SHARPSL_PARTS=m
 CONFIG_MTD_SLRAM=m
 CONFIG_MTD_SM_COMMON=m
-CONFIG_MTD_SPINAND_MT29F=m
-CONFIG_MTD_SPINAND_ONDIEECC=y
 CONFIG_MTD_SPI_NAND=m
 CONFIG_MTD_SPI_NOR=m
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
@@ -5893,7 +5913,9 @@ CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTK_AEE_KDUMP=y
+CONFIG_MTK_CMDQ=m
 CONFIG_MTK_CMDQ_MBOX=m
+CONFIG_MTK_CQDMA=m
 # CONFIG_MTK_EFUSE is not set
 CONFIG_MTK_HSDMA=m
 CONFIG_MTK_INFRACFG=y
@@ -5944,6 +5966,8 @@ CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
 CONFIG_MXC4005=m
 CONFIG_MXC6255=m
+CONFIG_MXC_CLK=y
+CONFIG_MXC_CLK_SCU=y
 CONFIG_MXC_TZIC=y
 CONFIG_MXM_WMI=m
 CONFIG_MXS_DMA=y
@@ -6118,6 +6142,9 @@ CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_LANTIQ_GSWIP=m
 CONFIG_NET_DSA_LEGACY=y
 # CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
 CONFIG_NET_DSA_MT7530=m
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MV88E6XXX=m
@@ -6134,6 +6161,7 @@ CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
 CONFIG_NET_DSA_TAG_GSWIP=y
 CONFIG_NET_DSA_TAG_KSZ=y
+CONFIG_NET_DSA_TAG_KSZ9477=y
 CONFIG_NET_DSA_TAG_LAN9303=y
 CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_DSA_TAG_QCA=y
@@ -6282,6 +6310,7 @@ CONFIG_NFC_ST_NCI=m
 CONFIG_NFC_ST_NCI_I2C=m
 CONFIG_NFC_ST_NCI_SPI=m
 CONFIG_NFC_TRF7970A=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
 CONFIG_NFP_APP_ABM_NIC=y
 CONFIG_NFP_APP_FLOWER=y
 # CONFIG_NFP_DEBUG is not set
@@ -6410,10 +6439,6 @@ CONFIG_NF_NAT_MASQUERADE_IPV4=y
 CONFIG_NF_NAT_MASQUERADE_IPV6=y
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_PROTO_DCCP=y
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_SCTP=y
-CONFIG_NF_NAT_PROTO_UDPLITE=y
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_SNMP_BASIC=m
@@ -6529,10 +6554,12 @@ CONFIG_NTFS_FS=m
 CONFIG_NUMA=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NVDIMM_DAX=y
+CONFIG_NVDIMM_KEYS=y
 CONFIG_NVDIMM_PFN=y
 CONFIG_NVEC_PAZ00=m
 CONFIG_NVEC_POWER=m
 CONFIG_NVM=y
+CONFIG_NVMEM=y
 CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
@@ -6549,12 +6576,15 @@ CONFIG_NVME_TARGET_FC=m
 # CONFIG_NVME_TARGET_FCLOOP is not set
 CONFIG_NVME_TARGET_LOOP=m
 CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_TCP=m
+CONFIG_NVME_TCP=m
 CONFIG_NVM_PBLK=m
 # CONFIG_NVM_PBLK_DEBUG is not set
 CONFIG_NVRAM=m
 CONFIG_NV_TCO=m
 CONFIG_N_HDLC=m
 # CONFIG_OABI_COMPAT is not set
+CONFIG_OBJAGG=m
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_OCFS2_DEBUG_MASKLOG=y
 CONFIG_OCFS2_FS=m
@@ -6810,6 +6840,7 @@ CONFIG_PCIE_RCAR=y
 CONFIG_PCIE_ROCKCHIP=y
 CONFIG_PCIE_ROCKCHIP_EP=y
 CONFIG_PCIE_ROCKCHIP_HOST=m
+CONFIG_PCIE_UNIPHIER=y
 CONFIG_PCIE_XILINX=y
 CONFIG_PCIE_XILINX_NWL=y
 CONFIG_PCI_ATMEL=m
@@ -6844,6 +6875,7 @@ CONFIG_PCI_IMX6=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
+# CONFIG_PCI_MESON is not set
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -6909,6 +6941,7 @@ CONFIG_PHY_BERLIN_USB=m
 CONFIG_PHY_BRCM_SATA=y
 CONFIG_PHY_BRCM_USB=m
 CONFIG_PHY_CADENCE_DP=m
+CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_CPCAP_USB=m
 CONFIG_PHY_DM816X_USB=m
 CONFIG_PHY_EXYNOS5250_SATA=y
@@ -6917,6 +6950,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=y
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
 CONFIG_PHY_EXYNOS_PCIE=y
+CONFIG_PHY_FSL_IMX8MQ_USB=m
 CONFIG_PHY_HI6220_USB=m
 CONFIG_PHY_HISI_INNO_USB2=m
 CONFIG_PHY_HISTB_COMBPHY=m
@@ -6954,6 +6988,7 @@ CONFIG_PHY_SAMSUNG_USB2=m
 CONFIG_PHY_SUN4I_USB=m
 # CONFIG_PHY_SUN9I_USB is not set
 CONFIG_PHY_TEGRA_XUSB=m
+CONFIG_PHY_TI_GMII_SEL=y
 CONFIG_PHY_TUSB1210=m
 CONFIG_PHY_UNIPHIER_PCIE=m
 CONFIG_PHY_UNIPHIER_USB2=m
@@ -7002,6 +7037,10 @@ CONFIG_PINCTRL_IMX6SLL=y
 CONFIG_PINCTRL_IMX6SX=y
 CONFIG_PINCTRL_IMX6UL=y
 CONFIG_PINCTRL_IMX7D=y
+CONFIG_PINCTRL_IMX7ULP=y
+CONFIG_PINCTRL_IMX8MQ=y
+CONFIG_PINCTRL_IMX8QXP=y
+CONFIG_PINCTRL_IMX_SCU=y
 CONFIG_PINCTRL_INTEL=m
 CONFIG_PINCTRL_IPQ4019=m
 CONFIG_PINCTRL_IPQ8064=m
@@ -7028,6 +7067,7 @@ CONFIG_PINCTRL_MT2701=y
 CONFIG_PINCTRL_MT2712=y
 CONFIG_PINCTRL_MT6397=y
 CONFIG_PINCTRL_MT6765=y
+CONFIG_PINCTRL_MT6797=y
 CONFIG_PINCTRL_MT7622=y
 CONFIG_PINCTRL_MT7623=y
 CONFIG_PINCTRL_MT8127=y
@@ -7040,6 +7080,7 @@ CONFIG_PINCTRL_MTK_PARIS=y
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_NPCM7XX=y
 CONFIG_PINCTRL_NS2_MUX=y
+CONFIG_PINCTRL_OCELOT=y
 CONFIG_PINCTRL_OWL=y
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_PINCTRL_PFC_EMEV2=y
@@ -7071,7 +7112,9 @@ CONFIG_PINCTRL_QDF2XXX=m
 CONFIG_PINCTRL_RK805=m
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_RZA1=y
+CONFIG_PINCTRL_RZA2=y
 CONFIG_PINCTRL_RZN1=y
+CONFIG_PINCTRL_S700=y
 CONFIG_PINCTRL_S900=y
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_SDM660=m
@@ -7120,6 +7163,7 @@ CONFIG_PL310_ERRATA_753970=y
 CONFIG_PL310_ERRATA_769419=y
 CONFIG_PL320_MBOX=y
 CONFIG_PL330_DMA=m
+CONFIG_PL353_SMC=m
 CONFIG_PLATFORM_MHU=m
 CONFIG_PLATFORM_SI4713=m
 CONFIG_PLAT_ORION=y
@@ -7131,6 +7175,7 @@ CONFIG_PLIP=m
 CONFIG_PLUGIN_HOSTCC=""
 CONFIG_PLX_HERMES=m
 CONFIG_PM=y
+CONFIG_PM8916_WATCHDOG=m
 CONFIG_PMBUS=m
 CONFIG_PMC_ATOM=y
 CONFIG_PMIC_ADP5520=y
@@ -7146,7 +7191,6 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
 CONFIG_PM_NOTIFIER_ERROR_INJECT=m
 CONFIG_PM_OPP=y
-CONFIG_PM_RMOBILE=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_DEBUG=y
 CONFIG_PM_SLEEP_SMP=y
@@ -7243,7 +7287,6 @@ CONFIG_PPC_SCOM=y
 CONFIG_PPC_SMLPAR=y
 CONFIG_PPC_SMP_MUXED_IPI=y
 CONFIG_PPC_SPLPAR=y
-CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_SUBPAGE_PROT=y
 CONFIG_PPC_TRANSACTIONAL_MEM=y
 CONFIG_PPC_UDBG_16550=y
@@ -7321,6 +7364,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PUNIT_ATOM_DEBUG=m
+CONFIG_PVH=y
 CONFIG_PVPANIC=m
 CONFIG_PWM_ATMEL_HLCDC_PWM=m
 CONFIG_PWM_BCM2835=m
@@ -7436,7 +7480,7 @@ CONFIG_QRTR_SMD=m
 CONFIG_QRTR_TUN=m
 CONFIG_QSEMI_PHY=m
 CONFIG_QTNFMAC=m
-CONFIG_QTNFMAC_PEARL_PCIE=m
+CONFIG_QTNFMAC_PCIE=m
 # CONFIG_QUEUED_LOCK_STAT is not set
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
@@ -7479,6 +7523,7 @@ CONFIG_RADIO_WL1273=m
 CONFIG_RADIO_WL128X=m
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
 CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_RANDOMIZE_BASE=y
@@ -7525,6 +7570,9 @@ CONFIG_RC_DECODERS=y
 CONFIG_RC_DEVICES=y
 CONFIG_RC_LOOPBACK=m
 CONFIG_RC_MAP=m
+CONFIG_RC_XBOX_DVD=m
+CONFIG_RDA_INTC=y
+CONFIG_RDA_TIMER=y
 CONFIG_RDMA_RXE=m
 CONFIG_RDS=m
 # CONFIG_RDS_DEBUG is not set
@@ -7545,13 +7593,13 @@ CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_AC97=m
-CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_SCCB=m
 CONFIG_REGMAP_SOUNDWIRE=m
 CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_W1=m
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_88PG86X=m
 CONFIG_REGULATOR_88PM800=m
 CONFIG_REGULATOR_88PM8607=m
@@ -7612,6 +7660,7 @@ CONFIG_REGULATOR_MAX8998=m
 CONFIG_REGULATOR_MC13783=m
 CONFIG_REGULATOR_MC13892=m
 CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MCP16502=m
 CONFIG_REGULATOR_MT6311=m
 CONFIG_REGULATOR_MT6323=m
 CONFIG_REGULATOR_MT6380=m
@@ -7692,7 +7741,7 @@ CONFIG_RESET_TEGRA_BPMP=y
 CONFIG_RESET_TI_SCI=m
 CONFIG_RESET_TI_SYSCON=m
 CONFIG_RESET_UNIPHIER=m
-CONFIG_RESET_UNIPHIER_USB3=m
+CONFIG_RESET_UNIPHIER_GLUE=m
 CONFIG_RETPOLINE=y
 CONFIG_RETU_WATCHDOG=m
 CONFIG_RFD77402=m
@@ -7742,6 +7791,7 @@ CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_ROCKCHIP_TIMER=y
 CONFIG_ROCKER=m
 CONFIG_ROCKETPORT=m
+CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_BOTH is not set
 # CONFIG_ROMFS_BACKED_BY_MTD is not set
@@ -7841,6 +7891,7 @@ CONFIG_RTC_DRV_GENERIC=y
 CONFIG_RTC_DRV_HID_SENSOR_TIME=m
 CONFIG_RTC_DRV_HYM8563=m
 CONFIG_RTC_DRV_IMXDI=m
+CONFIG_RTC_DRV_IMX_SC=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -8093,7 +8144,6 @@ CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_MPT3SAS=m
 CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MQ_DEFAULT=y
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 # CONFIG_SCSI_MVSAS_TASKLET is not set
 CONFIG_SCSI_MYRB=m
@@ -8123,6 +8173,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 CONFIG_SCSI_UFSHCD_PCI=m
 CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_UFS_BSG=y
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
 CONFIG_SCSI_UFS_DWC_TC_PCI=m
 CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
 CONFIG_SCSI_UFS_HISI=m
@@ -8146,6 +8197,8 @@ CONFIG_SDM_CAMCC_845=m
 CONFIG_SDM_DISPCC_845=m
 CONFIG_SDM_GCC_660=m
 CONFIG_SDM_GCC_845=m
+CONFIG_SDM_GPUCC_845=m
+CONFIG_SDM_LPASSCC_845=m
 CONFIG_SDM_VIDEOCC_845=m
 # CONFIG_SDR_MAX2175 is not set
 CONFIG_SDR_PLATFORM_DRIVERS=y
@@ -8326,6 +8379,8 @@ CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_OCC=y
+# CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -8333,6 +8388,9 @@ CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_POWR1220=m
 CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_RASPBERRYPI_HWMON=m
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
 CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_SCH56XX_COMMON=m
@@ -8446,6 +8504,8 @@ CONFIG_SERIAL_OWL=y
 CONFIG_SERIAL_OWL_CONSOLE=y
 CONFIG_SERIAL_PCH_UART=m
 CONFIG_SERIAL_QCOM_GENI=m
+CONFIG_SERIAL_RDA=y
+CONFIG_SERIAL_RDA_CONSOLE=y
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_SAMSUNG=m
 CONFIG_SERIAL_SAMSUNG_UARTS=4
@@ -8472,8 +8532,8 @@ CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_CT82C710=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_SERIO_I8042=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_NVEC_PS2=m
+CONFIG_SERIO_OLPC_APSP=m
 CONFIG_SERIO_PARKBD=m
 CONFIG_SERIO_PCIPS2=m
 CONFIG_SERIO_PS2MULT=m
@@ -8494,8 +8554,6 @@ CONFIG_SGL_ALLOC=y
 CONFIG_SG_POOL=y
 CONFIG_SG_SPLIT=y
 CONFIG_SHMEM=y
-CONFIG_SH_DMAE=m
-CONFIG_SH_DMAE_BASE=y
 CONFIG_SH_ETH=m
 CONFIG_SH_TIMER_CMT=y
 CONFIG_SH_TIMER_MTU2=y
@@ -8513,6 +8571,7 @@ CONFIG_SIOX=m
 CONFIG_SIOX_BUS_GPIO=m
 CONFIG_SIS190=m
 CONFIG_SIS900=m
+CONFIG_SKB_EXTENSIONS=y
 CONFIG_SKFP=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
@@ -8523,7 +8582,6 @@ CONFIG_SKY2=m
 CONFIG_SLAB_FREELIST_HARDENED=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLHC=y
 CONFIG_SLICOSS=m
 CONFIG_SLIC_DS26522=m
 CONFIG_SLIMBUS=m
@@ -8571,7 +8629,6 @@ CONFIG_SND_ALOOP=m
 CONFIG_SND_ALS100=m
 CONFIG_SND_ALS300=m
 CONFIG_SND_ALS4000=m
-CONFIG_SND_AM33XX_SOC_EVM=m
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
 CONFIG_SND_ASIHPI=m
@@ -8608,9 +8665,6 @@ CONFIG_SND_CS5535AUDIO=m
 CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
 CONFIG_SND_DARLA24=m
-CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
-# CONFIG_SND_DAVINCI_SOC_I2S is not set
-CONFIG_SND_DAVINCI_SOC_MCASP=m
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_DESIGNWARE_I2S=m
 CONFIG_SND_DESIGNWARE_PCM=y
@@ -8680,7 +8734,6 @@ CONFIG_SND_HWDEP=m
 CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
-CONFIG_SND_IMX_SOC=y
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INDIGODJ=m
 CONFIG_SND_INDIGODJX=m
@@ -8709,6 +8762,7 @@ CONFIG_SND_MESON_AXG_FIFO=m
 CONFIG_SND_MESON_AXG_FRDDR=m
 CONFIG_SND_MESON_AXG_PDM=m
 CONFIG_SND_MESON_AXG_SOUND_CARD=m
+CONFIG_SND_MESON_AXG_SPDIFIN=m
 CONFIG_SND_MESON_AXG_SPDIFOUT=m
 CONFIG_SND_MESON_AXG_TDMIN=m
 CONFIG_SND_MESON_AXG_TDMOUT=m
@@ -8727,15 +8781,6 @@ CONFIG_SND_MSND_PINNACLE=m
 CONFIG_SND_MTPAV=m
 CONFIG_SND_MTS64=m
 CONFIG_SND_NM256=m
-CONFIG_SND_OMAP_SOC=y
-CONFIG_SND_OMAP_SOC_DMIC=m
-CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
-CONFIG_SND_OMAP_SOC_MCBSP=y
-CONFIG_SND_OMAP_SOC_MCPDM=m
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
-CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
-CONFIG_SND_OMAP_SOC_OMAP_TWL4030=y
-CONFIG_SND_OMAP_SOC_RX51=m
 CONFIG_SND_OPL3SA2=m
 CONFIG_SND_OPL3_LIB=m
 CONFIG_SND_OPL3_LIB_SEQ=m
@@ -8777,7 +8822,6 @@ CONFIG_SND_SBAWE=m
 CONFIG_SND_SBAWE_SEQ=m
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SC6000=m
-CONFIG_SND_SDMA_SOC=y
 CONFIG_SND_SEQUENCER=m
 # CONFIG_SND_SEQUENCER_OSS is not set
 CONFIG_SND_SEQ_DEVICE=m
@@ -8804,6 +8848,7 @@ CONFIG_SND_SOC_ADAU17X1=m
 CONFIG_SND_SOC_ADAU7002=m
 CONFIG_SND_SOC_ADAU_UTILS=m
 CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
 CONFIG_SND_SOC_AK4458=m
 CONFIG_SND_SOC_AK4554=m
 CONFIG_SND_SOC_AK4613=m
@@ -8813,6 +8858,7 @@ CONFIG_SND_SOC_AK5558=m
 CONFIG_SND_SOC_ALC5623=m
 CONFIG_SND_SOC_ALC5632=m
 CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_SOC_ARIZONA=m
@@ -8843,6 +8889,7 @@ CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DAVINCI_MCASP=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES7241=m
@@ -8870,12 +8917,11 @@ CONFIG_SND_SOC_IMG_SPDIF_IN=m
 CONFIG_SND_SOC_IMG_SPDIF_OUT=m
 CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_MC13783=m
-CONFIG_SND_SOC_IMX_PCM_DMA=y
 CONFIG_SND_SOC_IMX_PCM_FIQ=y
-CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_IMX_SSI=m
 CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_INTEL_APL=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
 CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
@@ -8886,25 +8932,31 @@ CONFIG_SND_SOC_INTEL_BYTCR_RT5660_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 is not set
+CONFIG_SND_SOC_INTEL_CFL=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_GLK=m
 CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_HASWELL=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_KBL=m
 CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
 CONFIG_SND_SOC_INTEL_KBL_RT5660_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_MACH=y
+CONFIG_SND_SOC_INTEL_SKL=m
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_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
 CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
 CONFIG_SND_SOC_INTEL_SST=m
@@ -8936,7 +8988,14 @@ CONFIG_SND_SOC_NAU8810=m
 CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
+CONFIG_SND_SOC_NOKIA_RX51=m
 CONFIG_SND_SOC_ODROID=m
+CONFIG_SND_SOC_OMAP3_PANDORA=m
+CONFIG_SND_SOC_OMAP3_TWL4030=m
+CONFIG_SND_SOC_OMAP_ABE_TWL6040=m
+CONFIG_SND_SOC_OMAP_DMIC=m
+CONFIG_SND_SOC_OMAP_MCBSP=m
+CONFIG_SND_SOC_OMAP_MCPDM=m
 CONFIG_SND_SOC_PCM1681=m
 CONFIG_SND_SOC_PCM1789=m
 CONFIG_SND_SOC_PCM1789_I2C=m
@@ -9038,6 +9097,8 @@ CONFIG_SND_SOC_TEGRA_WM8753=m
 CONFIG_SND_SOC_TEGRA_WM8903=m
 CONFIG_SND_SOC_TEGRA_WM9712=m
 CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TI_EDMA_PCM=m
+CONFIG_SND_SOC_TI_SDMA_PCM=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
 CONFIG_SND_SOC_TLV320AIC23_SPI=m
@@ -9051,7 +9112,7 @@ CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
 CONFIG_SND_SOC_TSCS454=m
-CONFIG_SND_SOC_TWL4030=y
+CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
 CONFIG_SND_SOC_UNIPHIER=m
 CONFIG_SND_SOC_UNIPHIER_AIO=m
@@ -9086,6 +9147,7 @@ CONFIG_SND_SOC_WM8994=m
 CONFIG_SND_SOC_WM9712=m
 CONFIG_SND_SOC_WM_ADSP=m
 CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XTFPGA_I2S=m
 CONFIG_SND_SOC_ZX_AUD96P22=m
 CONFIG_SND_SONICVIBES=m
@@ -9177,6 +9239,7 @@ CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_IMX6UL=y
 CONFIG_SOC_IMX7D=y
 CONFIG_SOC_IMX7D_CA7=y
+CONFIG_SOC_IMX7ULP=y
 # CONFIG_SOC_LS1021A is not set
 CONFIG_SOC_OMAP3430=y
 # CONFIG_SOC_OMAP5 is not set
@@ -9259,6 +9322,8 @@ CONFIG_SPI_MEM=y
 CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
 CONFIG_SPI_MT65XX=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_NPCM_PSPI=m
 CONFIG_SPI_OC_TINY=m
 CONFIG_SPI_OMAP24XX=y
 CONFIG_SPI_ORION=m
@@ -9376,7 +9441,6 @@ CONFIG_STX104=m
 CONFIG_ST_UVIS25=m
 CONFIG_ST_UVIS25_I2C=m
 CONFIG_ST_UVIS25_SPI=m
-CONFIG_SUDMAC=m
 # CONFIG_SUN4I_EMAC is not set
 # CONFIG_SUN4I_GPADC is not set
 CONFIG_SUN50I_A64_CCU=y
@@ -9444,6 +9508,7 @@ CONFIG_SYSC_R8A77980=y
 CONFIG_SYSC_R8A77990=y
 CONFIG_SYSC_R8A77995=y
 CONFIG_SYSC_RCAR=y
+CONFIG_SYSC_RMOBILE=y
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_SYSFS_SYSCALL=y
@@ -9528,6 +9593,7 @@ CONFIG_TCS3472=m
 CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
+CONFIG_TEGRA20_EMC=y
 CONFIG_TEGRA_AHB=y
 CONFIG_TEGRA_BPMP=y
 CONFIG_TEGRA_BPMP_THERMAL=m
@@ -9597,6 +9663,7 @@ CONFIG_TIMERFD=y
 CONFIG_TIMER_ACPI=y
 CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
+CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
@@ -9626,6 +9693,7 @@ CONFIG_TI_CPTS=y
 CONFIG_TI_CPTS_MOD=y
 CONFIG_TI_DAC082S085=m
 CONFIG_TI_DAC5571=m
+CONFIG_TI_DAC7311=m
 CONFIG_TI_DAVINCI_CPDMA=y
 CONFIG_TI_DAVINCI_EMAC=m
 CONFIG_TI_DAVINCI_MDIO=y
@@ -9719,6 +9787,7 @@ CONFIG_TOUCHSCREEN_PCAP=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_PROPERTIES=y
+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
 CONFIG_TOUCHSCREEN_RM_TS=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_TOUCHSCREEN_S6SY761=m
@@ -9779,6 +9848,7 @@ CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 CONFIG_TPS68470_PMIC_OPREGION=y
+CONFIG_TQMX86_WDT=m
 CONFIG_TRACEPOINTS=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 CONFIG_TRACER_MAX_TRACE=y
@@ -9807,6 +9877,7 @@ CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
 CONFIG_TTPCI_EEPROM=m
 CONFIG_TTY=y
+CONFIG_TTY_PRINTK_LEVEL=6
 CONFIG_TULIP=m
 # CONFIG_TULIP_MMIO is not set
 # CONFIG_TULIP_MWI is not set
@@ -9876,6 +9947,7 @@ CONFIG_ULTRA=m
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_UNIPHIER_EFUSE=m
+CONFIG_UNIPHIER_MDMAC=m
 CONFIG_UNIPHIER_SYSTEM_BUS=y
 CONFIG_UNIPHIER_THERMAL=m
 CONFIG_UNIPHIER_WATCHDOG=m
@@ -10162,6 +10234,7 @@ CONFIG_USB_MXS_PHY=y
 CONFIG_USB_NET2272=m
 CONFIG_USB_NET2272_DMA=y
 CONFIG_USB_NET2280=m
+CONFIG_USB_NET_AQC111=m
 CONFIG_USB_NET_AX88179_178A=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
@@ -10368,6 +10441,7 @@ CONFIG_V4L_RADIO_ISA_DRIVERS=y
 CONFIG_V4L_TEST_DRIVERS=y
 # CONFIG_VBOXGUEST is not set
 CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
 CONFIG_VDSO=y
 CONFIG_VEML6070=m
 CONFIG_VERSION_SIGNATURE=""
@@ -10388,6 +10462,7 @@ CONFIG_VFIO_NOIOMMU=y
 CONFIG_VFIO_PCI_IGD=y
 CONFIG_VFIO_PCI_INTX=y
 CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_NVLINK2=y
 CONFIG_VFIO_PCI_VGA=y
 CONFIG_VFIO_PLATFORM=m
 CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m
@@ -10445,6 +10520,7 @@ CONFIG_VIDEO_ADV7842=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_AK7375=m
 # CONFIG_VIDEO_AK881X is not set
+CONFIG_VIDEO_ASPEED=m
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_AU0828_RC=y
 CONFIG_VIDEO_AU0828_V4L2=y
@@ -10503,6 +10579,7 @@ CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_I2C=m
+CONFIG_VIDEO_IMX214=m
 CONFIG_VIDEO_IMX258=m
 # CONFIG_VIDEO_IMX274 is not set
 CONFIG_VIDEO_IMX319=m
@@ -10512,6 +10589,7 @@ CONFIG_VIDEO_IMX_MEDIA=m
 CONFIG_VIDEO_IMX_PXP=m
 CONFIG_VIDEO_IMX_VDOA=m
 CONFIG_VIDEO_IPU3_CIO2=m
+CONFIG_VIDEO_IPU3_IMGU=m
 CONFIG_VIDEO_IR_I2C=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_IVTV_ALSA=m
@@ -10560,7 +10638,6 @@ CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_OV772X=m
 CONFIG_VIDEO_OV7740=m
 # CONFIG_VIDEO_OV9650 is not set
-CONFIG_VIDEO_PCI_SKELETON=m
 CONFIG_VIDEO_PVRUSB2=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_PVRUSB2_DVB=y
@@ -10577,6 +10654,7 @@ CONFIG_VIDEO_RENESAS_JPU=m
 CONFIG_VIDEO_RENESAS_VSP1=m
 CONFIG_VIDEO_RJ54N1=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
+CONFIG_VIDEO_ROCKCHIP_VPU=m
 # CONFIG_VIDEO_S5C73M3 is not set
 # CONFIG_VIDEO_S5K4ECGX is not set
 # CONFIG_VIDEO_S5K5BAF is not set
@@ -10603,6 +10681,8 @@ CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
 CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
+CONFIG_VIDEO_SECO_CEC=m
+CONFIG_VIDEO_SECO_RC=y
 CONFIG_VIDEO_SH_VEU=m
 # CONFIG_VIDEO_SMIAPP is not set
 CONFIG_VIDEO_SOLO6X10=m
@@ -10610,6 +10690,7 @@ CONFIG_VIDEO_SONY_BTF_MPX=m
 # CONFIG_VIDEO_SR030PC30 is not set
 CONFIG_VIDEO_STK1160=m
 CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_SUN6I_CSI=m
 CONFIG_VIDEO_SUNXI=y
 # CONFIG_VIDEO_TC358743 is not set
 CONFIG_VIDEO_TDA1997X=m
@@ -10693,6 +10774,7 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRT_TO_BUS=y
+CONFIG_VIRT_WIFI=m
 CONFIG_VITESSE_PHY=m
 CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
@@ -10927,6 +11009,7 @@ CONFIG_X86_PTDUMP_CORE=y
 # CONFIG_X86_RDC321X is not set
 CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_RESCTRL=y
 CONFIG_X86_RESERVE_LOW=64
 CONFIG_X86_SFI_CPUFREQ=m
 CONFIG_X86_SMAP=y
@@ -10964,6 +11047,7 @@ CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_EFI=y
 CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GNTDEV_DMABUF=y
 CONFIG_XEN_GRANT_DEV_ALLOC=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index ece67c47abe3e272f8180998f431e34584737c66..f274b51dc2cf84c07df05e5ebd7f9119b32b418d 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -61,7 +61,6 @@ CONFIG_CRAMFS=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_DMADEVICES=y
 # CONFIG_DMA_CMA is not set
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 # CONFIG_DM_DEBUG is not set
@@ -126,6 +125,9 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_AMD_MP2=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_SLAVE is not set
 CONFIG_I6300ESB_WDT=m
@@ -160,10 +162,8 @@ CONFIG_LAPB=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
-CONFIG_LOCK_DOWN_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
 CONFIG_MACB=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
@@ -182,14 +182,18 @@ CONFIG_MEGARAID_SAS=m
 CONFIG_MEMORY=y
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMSTICK=m
-CONFIG_MFD_CORE=y
+CONFIG_MFD_DA9063=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
 CONFIG_MFD_MADERA=m
+CONFIG_MFD_MAX14577=y
+CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -261,7 +265,6 @@ CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=8
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
-CONFIG_NVMEM=y
 CONFIG_N_GSM=m
 # CONFIG_OF is not set
 CONFIG_OMFS_FS=m
@@ -318,8 +321,8 @@ CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_REED_SOLOMON=m
 # CONFIG_REFCOUNT_FULL is not set
+CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPMI=m
-CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_TWL4030=m
@@ -386,10 +389,12 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
+CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SLHC=y
 CONFIG_SLIP=m
 CONFIG_SND=m
 CONFIG_SND_COMPRESS_OFFLOAD=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index fa0f31db0e7c9126aadbea772d98b54dc6dfbe4f..26226d566bc98947a7f5f1dd7006e175bbf0282a 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -45,7 +45,6 @@ CONFIG_BLK_DEV_SKD=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_UMEM=m
-CONFIG_BOUNCE=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_C2PORT=m
@@ -62,7 +61,6 @@ CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-CONFIG_DMADEVICES=y
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 # CONFIG_DM_DEBUG is not set
 CONFIG_DNET=m
@@ -130,6 +128,9 @@ CONFIG_HZ=250
 CONFIG_HZ_250=y
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_SLAVE is not set
 CONFIG_I6300ESB_WDT=m
 CONFIG_IEEE802154=m
@@ -164,10 +165,8 @@ CONFIG_LAPB=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
 CONFIG_MACB=m
 CONFIG_MAC_PARTITION=y
 CONFIG_MAILBOX=y
@@ -189,15 +188,19 @@ CONFIG_MEMORY=y
 # CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEM_SOFT_DIRTY is not set
-CONFIG_MFD_CORE=y
+CONFIG_MFD_DA9063=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
 CONFIG_MFD_MADERA=m
+CONFIG_MFD_MAX14577=y
+CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 # CONFIG_MFD_TPS65217 is not set
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
@@ -214,6 +217,8 @@ CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_BCH=m
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_OF_PARTS=m
+# CONFIG_MTD_PHYSMAP_GEMINI is not set
+# CONFIG_MTD_PHYSMAP_VERSATILE is not set
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_ADAPTEC=y
@@ -269,7 +274,6 @@ CONFIG_NR_CPUS=2048
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_NVMEM=y
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m
@@ -324,8 +328,8 @@ CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REED_SOLOMON=m
 # CONFIG_REFCOUNT_FULL is not set
+CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPMI=m
-CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_TWL4030=m
@@ -380,6 +384,7 @@ CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_WD719X=m
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SENSORS_OCC_P9_SBE=m
 CONFIG_SERIAL_8250_DW=m
 # CONFIG_SERIAL_8250_FINTEK is not set
 CONFIG_SERIAL_ALTERA_JTAGUART=m
@@ -392,10 +397,12 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
+CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SLHC=y
 CONFIG_SLIP=m
 CONFIG_SND=m
 CONFIG_SND_DMAENGINE_PCM=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 774892023c226ba0c6cf66661e4f448b85360a1d..9932fcd21c64bdb17f8ef964dd59846ba56df9dc 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -51,8 +51,8 @@ CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 # CONFIG_DECNET is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-# CONFIG_DMADEVICES is not set
 # CONFIG_DMA_CMA is not set
+CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DM_DEBUG=y
 # CONFIG_DNET is not set
 # CONFIG_DRM is not set
@@ -105,7 +105,12 @@ CONFIG_HZ=100
 CONFIG_HZ_100=y
 # CONFIG_HZ_1000 is not set
 # CONFIG_HZ_250 is not set
-# CONFIG_I2C is not set
+CONFIG_I2C=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+# CONFIG_I2C_SLAVE is not set
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_IEEE802154 is not set
 # CONFIG_IIO is not set
@@ -137,10 +142,8 @@ CONFIG_KVM=y
 # CONFIG_LDM_PARTITION is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LLC2 is not set
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
 # CONFIG_MACB is not set
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MAILBOX is not set
@@ -160,14 +163,18 @@ CONFIG_MD_MULTIPATH=y
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 # CONFIG_MEMSTICK is not set
 CONFIG_MEM_SOFT_DIRTY=y
-CONFIG_MFD_CORE=m
+CONFIG_MFD_DA9063=m
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_MADERA is not set
+CONFIG_MFD_MAX14577=m
+CONFIG_MFD_MAX77693=m
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
+CONFIG_MFD_TPS65912=m
+CONFIG_MFD_TPS65912_I2C=m
 # CONFIG_MINIX_FS is not set
 # CONFIG_MINIX_SUBPARTITION is not set
 # CONFIG_MISC_RTSX_PCI is not set
@@ -228,7 +235,6 @@ CONFIG_NR_CPUS=256
 CONFIG_NTFS_RW=y
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
 CONFIG_NUMA_EMU=y
-# CONFIG_NVMEM is not set
 # CONFIG_N_GSM is not set
 # CONFIG_OF is not set
 # CONFIG_OMFS_FS is not set
@@ -237,6 +243,7 @@ CONFIG_NUMA_EMU=y
 CONFIG_PANIC_TIMEOUT=0
 # CONFIG_PARPORT is not set
 # CONFIG_PC104 is not set
+CONFIG_PCCARD=m
 CONFIG_PCIEPORTBUS=y
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PCI_PASID is not set
@@ -255,7 +262,7 @@ CONFIG_PHYLIB=m
 # CONFIG_POWERCAP is not set
 # CONFIG_POWER_AVS is not set
 # CONFIG_POWER_SUPPLY is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
 CONFIG_PPS=m
 # CONFIG_PPS_CLIENT_GPIO is not set
 # CONFIG_PPS_CLIENT_LDISC is not set
@@ -265,6 +272,8 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PSTORE is not set
 CONFIG_PTP_1588_CLOCK=m
 # CONFIG_PWM is not set
+CONFIG_QCOM_HIDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
 # CONFIG_R3964 is not set
@@ -272,7 +281,8 @@ CONFIG_PTP_1588_CLOCK=m
 # CONFIG_RAW_DRIVER is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_REFCOUNT_FULL is not set
-# CONFIG_REGULATOR is not set
+CONFIG_REGMAP_I2C=m
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
 # CONFIG_REISERFS_FS is not set
 # CONFIG_RESET_CONTROLLER is not set
 # CONFIG_RFKILL is not set
@@ -329,11 +339,13 @@ CONFIG_SERIAL_CORE=m
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIO is not set
+CONFIG_SERIO=m
+CONFIG_SERIO_LIBPS2=m
 # CONFIG_SFC is not set
 # CONFIG_SFC_FALCON is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_SGI_PARTITION is not set
+CONFIG_SLHC=m
 # CONFIG_SLIP is not set
 # CONFIG_SOC_TI is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
@@ -347,6 +359,9 @@ CONFIG_STANDALONE=y
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_SYSV_FS is not set
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
 # CONFIG_THERMAL is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TRACE_SINK is not set