core/linux-armv7-rc to 4.10.rc1-1

2025-03-19 00:21:40 +00:00 · 2016-12-31 06:33:03 +00:00 · 2016-12-31 06:33:03 +00:00 · 667d871d5b
commit 667d871d5b
parent 96e7d6fe83
11 changed files with 236 additions and 100 deletions
--- a/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@ -1,7 +1,7 @@
-From 001565916ddb8589ec7920b0d3c0d007225c79c4 Mon Sep 17 00:00:00 2001
+From ce5295efea45661c5e13354ee03d7073271bf914 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
-Subject: [PATCH 1/8] ARM: atags: add support for Marvell's u-boot
+Subject: [PATCH 1/9] ARM: atags: add support for Marvell's u-boot

 Marvell uses a specific atag in its u-boot which includes among other
 information the MAC addresses for up to 4 network interfaces.
@ -12,7 +12,7 @@ Signed-off-by: Willy Tarreau <w@xxxxxx>
 1 file changed, 17 insertions(+)

 diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h
-index 979ff40..d1d0c19 100644
+index 979ff4016404..d1d0c1950fa4 100644
 --- a/arch/arm/include/uapi/asm/setup.h
 +++ b/arch/arm/include/uapi/asm/setup.h
@@ -143,6 +143,18 @@ struct tag_memclk {
@ -47,5 +47,5 @@ index 979ff40..d1d0c19 100644
 };
 
 -- 
-2.10.0
+2.11.0

--- a/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@ -1,7 +1,7 @@
-From c25c95072f199e0d0a56cbd4db701ab5b36a9f0c Mon Sep 17 00:00:00 2001
+From bcb91efdc2130f91a7bd87d52022ef942aec6a14 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
-Subject: [PATCH 2/8] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
+Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
 loader

 The atags are parsed and if a Marvell atag is found, up to 4 MAC
@ -17,7 +17,7 @@ Signed-off-by: Willy Tarreau <w@xxxxxx>
 1 file changed, 7 insertions(+), 1 deletion(-)

 diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c
-index 9448aa0..ac7b6ae 100644
+index 9448aa0c6686..ac7b6ae6c00f 100644
 --- a/arch/arm/boot/compressed/atags_to_fdt.c
 +++ b/arch/arm/boot/compressed/atags_to_fdt.c
@@ -18,7 +18,7 @@ static int node_offset(void *fdt, const char *node_path)
@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644
 	}
 
 -- 
-2.10.0
+2.11.0

--- a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch
+++ b/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch
@ -1,7 +1,7 @@
-From 3822d03ac84e6581583c3e533eb0e015334242bd Mon Sep 17 00:00:00 2001
+From 6112c7b35b2c6c5a02a69f2a4b9ea3c562b7012f Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:41:19 -0600
-Subject: [PATCH 3/8] SMILE Plug device tree file
+Subject: [PATCH 3/9] SMILE Plug device tree file

 This adds a dts file for the SMILE Plug, which only differs from the Mirabox
 dts with the LED definitions.
@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts

 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index befcd26..2be4c48 100644
+index cccdbcb557b6..74b4dcbe8bbd 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -906,6 +906,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -933,6 +933,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
 	armada-370-db.dtb \
 	armada-370-dlink-dns327l.dtb \
 	armada-370-mirabox.dtb \
@ -27,7 +27,7 @@ index befcd26..2be4c48 100644
 	armada-370-rd.dtb \
 diff --git a/arch/arm/boot/dts/armada-370-smileplug.dts b/arch/arm/boot/dts/armada-370-smileplug.dts
 new file mode 100644
-index 0000000..d01308a
+index 000000000000..d01308ab848b
 --- /dev/null
 +++ b/arch/arm/boot/dts/armada-370-smileplug.dts
@@ -0,0 +1,173 @@
@ -205,5 +205,5 @@ index 0000000..d01308a
 +	};
 +};
 -- 
-2.10.0
+2.11.0

--- a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch
+++ b/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch
@ -1,7 +1,7 @@
-From 51597a7978cb561ba33d2fe4f9fb3aa07f448cc4 Mon Sep 17 00:00:00 2001
+From b1a1331419ffe23e8736fa8b942bd2ca2430a1a9 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
-Subject: [PATCH 4/8] fix mvsdio eMMC timing
+Subject: [PATCH 4/9] fix mvsdio eMMC timing

 These changes from Globalscale change the MMC timing to allow the eMMC versions
 of the Mirabox and SMILE Plug to work.
@ -12,7 +12,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index 42296e5..e5ce6d2 100644
+index 42296e55b9de..e5ce6d27ec82 100644
 --- a/drivers/mmc/host/mvsdio.c
 +++ b/drivers/mmc/host/mvsdio.c
@@ -93,7 +93,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data)
@ -34,5 +34,5 @@ index 42296e5..e5ce6d2 100644
 		host->clock = ios->clock;
 		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.10.0
+2.11.0

--- a/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@ -1,14 +1,14 @@
-From f0e29c8c8744317cfe946faf4f4ebae76f2c4eb1 Mon Sep 17 00:00:00 2001
+From 158d5a686346c0230093c15a46df00c3cf8a6ec6 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
-Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter
+Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter

 ---
 drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index 831aa33..0362554 100644
+index 831aa33d078a..03625547d794 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
@@ -60,6 +60,7 @@
@ -91,5 +91,5 @@ index 831aa33..0362554 100644
 
 	/* maybe the boot loader passed the MAC address in devicetree */
 -- 
-2.10.0
+2.11.0

--- a/core/linux-armv7-rc/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
+++ b/core/linux-armv7-rc/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
@ -1,7 +1,7 @@
-From 200fab4de6f535e626095b9782b56e0ed101409c Mon Sep 17 00:00:00 2001
+From 68671e2e7cc6ac31bb8bad764b45c88d771f79e4 Mon Sep 17 00:00:00 2001
 From: dobatog <dobatog@gmail.com>
 Date: Thu, 26 Feb 2015 12:32:27 +0100
-Subject: [PATCH 6/8] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
+Subject: [PATCH 6/9] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
 related to input routing signals.

 The following patch, based on stable v3.19,  corrects the errors that are reported in the boot trace in reference to the Input Signals of the audio codec TLV320AIC23:
@ -27,7 +27,7 @@ Tested-by: Max Filippov <jcmvbkbc@gmail.com>
 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
-index 410cae0..0bb8e26 100644
+index 410cae0f2060..0bb8e2602d8e 100644
 --- a/sound/soc/codecs/tlv320aic23.c
 +++ b/sound/soc/codecs/tlv320aic23.c
@@ -174,10 +174,10 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = {
@ -45,5 +45,5 @@ index 410cae0..0bb8e26 100644
 	/* input mux */
 	{"Capture Source", "Line", "Line Input"},
 -- 
-2.10.0
+2.11.0

--- a/core/linux-armv7-rc/0007-set-default-cubietruck-led-triggers.patch
+++ b/core/linux-armv7-rc/0007-set-default-cubietruck-led-triggers.patch
@ -1,7 +1,7 @@
-From 011f5e6c9ef7350ac6e7bbd486318b1b96d78652 Mon Sep 17 00:00:00 2001
+From 789190f46370b2c60ba36d7f1793aaed451b925e Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
-Subject: [PATCH 7/8] set default cubietruck led triggers
+Subject: [PATCH 7/9] set default cubietruck led triggers

 Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 ---
@ -9,7 +9,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 1 file changed, 2 insertions(+)

 diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-index 83f39b0..15e9626 100644
+index 83f39b0362cb..15e9626ea81b 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -70,6 +70,7 @@
@ -29,5 +29,5 @@ index 83f39b0..15e9626 100644
 	};
 
 -- 
-2.10.0
+2.11.0

--- a/core/linux-armv7-rc/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+++ b/core/linux-armv7-rc/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
@ -1,7 +1,7 @@
-From 21fd4defb20c41ae93e86c4a5e6adcb1afd36be9 Mon Sep 17 00:00:00 2001
+From 0d0891b7abde896742d966ca32bc0a45d6bfe5b7 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 11 Aug 2016 00:42:37 -0600
-Subject: [PATCH 8/8] exynos4412-odroid: set higher minimum buck2 regulator
+Subject: [PATCH 8/9] exynos4412-odroid: set higher minimum buck2 regulator
 voltage

 Set a higher minimum voltage to help reboot issue.
@ -13,7 +13,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-index 8aa19ba..8e2d94e 100644
+index 8aa19ba14436..8e2d94e3af72 100644
 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -423,7 +423,7 @@
@ -26,5 +26,5 @@ index 8aa19ba..8e2d94e 100644
 				regulator-always-on;
 				regulator-boot-on;
 -- 
-2.10.0
+2.11.0

--- a/core/linux-armv7-rc/0009-drm-armada-tracing-fix.patch
+++ b/core/linux-armv7-rc/0009-drm-armada-tracing-fix.patch
@ -0,0 +1,23 @@
+From 5fe550f8ac792b731055ad12a3aa65e3b7c9529d Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Mon, 26 Dec 2016 12:56:09 -0700
+Subject: [PATCH 9/9] drm/armada tracing fix
+
+https://lists.freedesktop.org/archives/dri-devel/2016-December/126212.html
+---
+ drivers/gpu/drm/armada/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile
+index a18f156c8b66..64c0b4546fb2 100644
+--- a/drivers/gpu/drm/armada/Makefile
+++ b/drivers/gpu/drm/armada/Makefile
+@@ -4,3 +4,5 @@ armada-y	+= armada_510.o
+ armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
+ 
+ obj-$(CONFIG_DRM_ARMADA) := armada.o
+
+CFLAGS_armada_trace.o := -I$(src)
+-- 
+2.11.0
+
--- a/core/linux-armv7-rc/PKGBUILD
+++ b/core/linux-armv7-rc/PKGBUILD
@ -3,12 +3,11 @@

 buildarch=4

-_rcver=4.9
-_rcrel=8
-_rcnrel=armv7-x3
+_rcver=4.10
+_rcrel=1
+_rcnrel=armv7-x1

 pkgbase=linux-armv7-rc
-#_srcname=linux-4.$((${_rcver##*.}-1))
 _srcname=linux-${_rcver}-rc${_rcrel}
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform (release candidate)"
@ -19,9 +18,7 @@ url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc')
 options=('!strip')
-source=(#"http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
-        #"https://www.kernel.org/pub/linux/kernel/v4.x/testing/patch-${_rcver}-rc${_rcrel}.xz"
-        "https://www.kernel.org/pub/linux/kernel/v4.x/testing/${_srcname}.tar.xz"
+source=("https://www.kernel.org/pub/linux/kernel/v4.x/testing/${_srcname}.tar.xz"
        "http://rcn-ee.com/deb/sid-armhf/v${_rcver}.0-rc${_rcrel}-${_rcnrel}/patch-${_rcver}-rc${_rcrel}-${_rcnrel}.diff.gz"
        '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
        '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
@ -31,22 +28,24 @@ source=(#"http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
        '0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch'
        '0007-set-default-cubietruck-led-triggers.patch'
        '0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch'
+        '0009-drm-armada-tracing-fix.patch'
        'config'
        'cmdline'
        'kernel.its'
        'kernel.keyblock'
        'kernel_data_key.vbprivk')
-md5sums=('f8ab74a9a1a2adf30ddadbcf14ef7c8a'
-         '4c46b6b53b3419f51f36fa960e8499d5'
-         '7bad9743fd2f1690f479cbbec5a556ab'
-         '57998a8dbf42d2237f2f3a650b93ef26'
-         '75e392a161842813d0ff3d0beaf68038'
-         '5840b71b7b2600388aa9a1195a5af528'
-         '25c3f00750a1aa951b857bf06ec79a8e'
-         'dd1c99be98c43f06a07aa14fc47d6e3e'
-         'ef825f8c3563a87bab10f4782e7a0efc'
-         'ef5fd8e682fed9dce4bc3d1c821acbd1'
-         '3565b216902c447824bff6751b544467'
+md5sums=('f1969e506627fcd7d2e009576b1f30f0'
+         '00a1a481170b67d2869628fe944451b6'
+         '430137ab493c2279c0cd13a3570b3449'
+         'f8b1e21e890bb5cbc9b0c876467f0772'
+         '2caa18222d17b6bf0d701939a1dcb8fb'
+         '90902739306bd9d3a26bdb9e1905ac87'
+         'c4e3758113bc37983552cc2889302b7e'
+         'cf0ab26b775cbdfc31d06113625bfe19'
+         '5f1f081fa789b652f42d43548aa5b210'
+         'acf706b512918f216a2cf320710f9edc'
+         '5c0c23275255d7b368fb50258b76499c'
+         'd04622b234b753ae84a5325eee99fc9e'
         '1813b39074d01af6548951764a0f6444'
         '4f2379ed84258050edb858ee8d281678'
         '61c5ff73c136ed07a7aadbf58db3d96a'
@ -55,9 +54,6 @@ md5sums=('f8ab74a9a1a2adf30ddadbcf14ef7c8a'
 prepare() {
  cd "${srcdir}/${_srcname}"

-  # add upstream patch
-  #patch -sp1 -i ../patch-${_rcver}-rc${_rcrel}
-
  # RCN patch
  git apply ../patch-${_rcver}-rc${_rcrel}-${_rcnrel}.diff
  rm -f scripts/bin2c
@ -71,6 +67,7 @@ prepare() {
  git apply ../0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
  git apply ../0007-set-default-cubietruck-led-triggers.patch
  git apply ../0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+  git apply ../0009-drm-armada-tracing-fix.patch

  cat "${srcdir}/config" > ./.config

--- a/core/linux-armv7-rc/config
+++ b/core/linux-armv7-rc/config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.0-rc7-2 Kernel Configuration
+# Linux/arm 4.10.0-rc1-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@ -142,6 +142,7 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
@ -161,6 +162,7 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
+CONFIG_INITRAMFS_COMPRESSION=".gz"
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@ -173,6 +175,7 @@ CONFIG_MULTIUSER=y
 # CONFIG_SGETMASK_SYSCALL is not set
 CONFIG_SYSFS_SYSCALL=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_POSIX_TIMERS=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
@ -293,8 +296,12 @@ CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_CMDLINE_PARSER=y
+CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_SQ=y
+CONFIG_BLK_WBT_MQ=y

 #
 # Partition Types
@ -473,9 +480,6 @@ CONFIG_ARCH_OMAP=y
 CONFIG_POWER_AVS_OMAP=y
 CONFIG_POWER_AVS_OMAP_CLASS3=y
 CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_MUX=y
-# CONFIG_OMAP_MUX_DEBUG is not set
-CONFIG_OMAP_MUX_WARNINGS=y
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 CONFIG_OMAP_DM_TIMER=y
@ -856,7 +860,6 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y
 # CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
 CONFIG_ARM_TEGRA20_CPUFREQ=y
 CONFIG_ARM_TEGRA124_CPUFREQ=y
-CONFIG_ARM_TI_CPUFREQ=y
 # CONFIG_QORIQ_CPUFREQ is not set

 #
@ -992,6 +995,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_RAW_DIAG=m
 # CONFIG_INET_DIAG_DESTROY is not set
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
@ -1029,7 +1033,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
 CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-# CONFIG_IPV6_VTI is not set
+CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_NDISC_NODETYPE=y
@ -1042,6 +1046,9 @@ CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_INLINE=y
+CONFIG_IPV6_SEG6_HMAC=y
 CONFIG_NETLABEL=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y
@ -1061,6 +1068,7 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_LOG_NETDEV=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
@ -1069,10 +1077,10 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@ -1090,9 +1098,9 @@ CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_PROTO_DCCP=y
+CONFIG_NF_NAT_PROTO_UDPLITE=y
+CONFIG_NF_NAT_PROTO_SCTP=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@ -1105,6 +1113,7 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_RT=m
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_SET_RBTREE=m
@ -1115,12 +1124,15 @@ CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
+CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@ -1221,6 +1233,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
 CONFIG_IP_SET_HASH_IPPORT=m
 CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
 CONFIG_IP_SET_HASH_MAC=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
@ -1276,10 +1289,12 @@ CONFIG_IP_VS_PE_SIP=m
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TABLES_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@ -1321,10 +1336,12 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TABLES_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
@ -1851,6 +1868,7 @@ CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
 CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 # CONFIG_NET_DEVLINK is not set
 CONFIG_MAY_USE_DEVLINK=y
@ -1882,16 +1900,18 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
+CONFIG_REGMAP_AC97=m
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_FENCE_TRACE is not set
+# CONFIG_DMA_FENCE_TRACE is not set
 CONFIG_DMA_CMA=y

 #
@ -1921,6 +1941,7 @@ CONFIG_OMAP_INTERCONNECT=y
 CONFIG_OMAP_OCP2SCP=y
 CONFIG_SIMPLE_PM_BUS=y
 CONFIG_SUNXI_RSB=y
+# CONFIG_TEGRA_GMI is not set
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
@ -2028,6 +2049,7 @@ CONFIG_MTD_NAND_PXA3xx=y
 # CONFIG_MTD_NAND_BRCMNAND is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_ORION is not set
+# CONFIG_MTD_NAND_OXNAS is not set
 # CONFIG_MTD_NAND_VF610_NFC is not set
 CONFIG_MTD_NAND_MXC=m
 # CONFIG_MTD_NAND_DAVINCI is not set
@ -2107,6 +2129,7 @@ CONFIG_NVME_CORE=m
 CONFIG_BLK_DEV_NVME=m
 # CONFIG_BLK_DEV_NVME_SCSI is not set
 # CONFIG_NVME_RDMA is not set
+# CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set

 #
@ -2300,6 +2323,7 @@ CONFIG_SCSI_STEX=m
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
 # CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_QEDI is not set
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 # CONFIG_SCSI_DC395x is not set
@ -2437,7 +2461,7 @@ CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_MQ_DEFAULT is not set
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
 CONFIG_DM_CRYPT=m
@ -2558,6 +2582,8 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+# CONFIG_SLICOSS is not set
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
 CONFIG_SUN8I_EMAC=m
@ -2569,9 +2595,9 @@ CONFIG_NET_VENDOR_AMAZON=y
 CONFIG_NET_VENDOR_AMD=y
 # CONFIG_AMD8111_ETH is not set
 CONFIG_PCNET32=m
+# CONFIG_AMD_XGBE_HAVE_ECC is not set
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_ARC_EMAC_CORE=m
-CONFIG_ARC_EMAC=m
 CONFIG_EMAC_ROCKCHIP=m
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
@ -2582,6 +2608,7 @@ CONFIG_ALX=m
 # CONFIG_NET_VENDOR_AURORA is not set
 CONFIG_NET_CADENCE=y
 CONFIG_MACB=m
+# CONFIG_MACB_PCI is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_B44 is not set
 # CONFIG_BCMGENET is not set
@ -2591,6 +2618,7 @@ CONFIG_TIGON3=m
 CONFIG_BNX2X=m
 # CONFIG_SYSTEMPORT is not set
 CONFIG_BNXT=m
+# CONFIG_BNXT_DCB is not set
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_VENDOR_CAVIUM=y
@ -2749,10 +2777,12 @@ CONFIG_SC92031=m
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
 CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MCDI_LOGGING=y
+# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_EPIC100=m
@ -2802,6 +2832,7 @@ CONFIG_SKFP=m
 # CONFIG_HIPPI is not set
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y

 #
 # MDIO bus device drivers
@ -2833,6 +2864,7 @@ CONFIG_ICPLUS_PHY=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_MARVELL_PHY=y
+# CONFIG_MESON_GXL_PHY is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROSEMI_PHY is not set
@ -2907,6 +2939,7 @@ CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ADM8211=m
 CONFIG_ATH_COMMON=m
@ -3413,11 +3446,15 @@ CONFIG_INPUT_DRV2667_HAPTICS=m
 CONFIG_RMI4_CORE=m
 CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SPI=m
+# CONFIG_RMI4_SMB is not set
+# CONFIG_RMI4_F03 is not set
 CONFIG_RMI4_2D_SENSOR=y
 CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F34 is not set
 # CONFIG_RMI4_F54 is not set
+# CONFIG_RMI4_F55 is not set

 #
 # Hardware I/O ports
@ -3522,7 +3559,6 @@ CONFIG_SERIAL_FSL_LPUART=y
 CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
 # CONFIG_SERIAL_ST_ASC is not set
-# CONFIG_SERIAL_STM32 is not set
 # CONFIG_SERIAL_MVEBU_UART is not set
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_TTY_PRINTK=m
@ -3544,6 +3580,7 @@ CONFIG_HW_RANDOM_MESON=m
 # CONFIG_APPLICOM is not set
 # CONFIG_RAW_DRIVER is not set
 CONFIG_TCG_TPM=m
+# CONFIG_TCG_TIS is not set
 # CONFIG_TCG_TIS_SPI is not set
 CONFIG_TCG_TIS_I2C_ATMEL=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
@ -3573,6 +3610,7 @@ CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_MUX_PINCTRL=y
 # CONFIG_I2C_MUX_REG is not set
 CONFIG_I2C_DEMUX_PINCTRL=y
+# CONFIG_I2C_MUX_MLXCPLD is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=y
@ -3614,12 +3652,14 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_EXYNOS5=y
 CONFIG_I2C_GPIO=y
 CONFIG_I2C_IMX=y
+# CONFIG_I2C_IMX_LPI2C is not set
 CONFIG_I2C_MESON=y
 CONFIG_I2C_MV64XXX=y
 # CONFIG_I2C_NOMADIK is not set
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_OMAP=y
 CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA is not set
 # CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_RK3X=y
 CONFIG_HAVE_S3C2410_I2C=y
@ -3658,6 +3698,7 @@ CONFIG_SPI_MASTER=y
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_ARMADA_3700 is not set
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 CONFIG_SPI_BCM2835=m
 CONFIG_SPI_BCM2835AUX=m
@ -3667,6 +3708,7 @@ CONFIG_SPI_CADENCE=y
 CONFIG_SPI_DAVINCI=y
 # CONFIG_SPI_DESIGNWARE is not set
 CONFIG_SPI_DLN2=m
+CONFIG_SPI_FSL_LPSPI=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_IMX=m
 CONFIG_SPI_FSL_LIB=m
@ -3755,6 +3797,7 @@ CONFIG_PINCTRL_AS3722=y
 CONFIG_PINCTRL_MESON=y
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_SX150X=y
 CONFIG_PINCTRL_TI_IODELAY=y
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_PINCTRL_ZYNQ=y
@ -3807,7 +3850,7 @@ CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
 CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
 # CONFIG_GPIO_OF_HELPER is not set
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MAX730X=m
@ -3820,7 +3863,6 @@ CONFIG_GPIO_MAX730X=m
 CONFIG_GPIO_AXP209=y
 CONFIG_GPIO_DAVINCI=y
 CONFIG_GPIO_DWAPB=y
-# CONFIG_GPIO_EM is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_GRGPIO is not set
 # CONFIG_GPIO_MOCKUP is not set
@ -3833,11 +3875,9 @@ CONFIG_GPIO_SYSCON=y
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TS4800 is not set
 CONFIG_GPIO_VF610=y
-# CONFIG_GPIO_VX855 is not set
 CONFIG_GPIO_XILINX=y
 # CONFIG_GPIO_ZEVIO is not set
 CONFIG_GPIO_ZYNQ=y
-# CONFIG_GPIO_ZX is not set

 #
 # I2C GPIO expanders
@ -3873,8 +3913,6 @@ CONFIG_GPIO_TWL6040=y
 #
 # PCI GPIO expanders
 #
-# CONFIG_GPIO_AMD8111 is not set
-# CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_RDC321X is not set

 #
@ -4056,6 +4094,7 @@ CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MAX31790=m
 CONFIG_SENSORS_MCP3021=m
+# CONFIG_SENSORS_TC654 is not set
 CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM70=m
@ -4125,6 +4164,7 @@ CONFIG_SENSORS_TC74=m
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP103=m
+# CONFIG_SENSORS_TMP108 is not set
 CONFIG_SENSORS_TMP401=m
 CONFIG_SENSORS_TMP421=m
 CONFIG_SENSORS_TWL4030_MADC=m
@ -4279,6 +4319,7 @@ CONFIG_BCMA_DRIVER_PCI=y
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_ALTERA_A10SR is not set
 CONFIG_MFD_ACT8945A=y
+# CONFIG_MFD_SUN4I_GPADC is not set
 # CONFIG_MFD_AS3711 is not set
 CONFIG_MFD_AS3722=y
 # CONFIG_PMIC_ADP5520 is not set
@ -4334,7 +4375,7 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_UCB1400_CORE is not set
-# CONFIG_MFD_PM8921_CORE is not set
+# CONFIG_MFD_PM8XXX is not set
 # CONFIG_MFD_RDC321X is not set
 CONFIG_MFD_RTSX_PCI=m
 # CONFIG_MFD_RT5033 is not set
@ -4475,6 +4516,8 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+# CONFIG_MEDIA_CEC_DEBUG is not set
 CONFIG_MEDIA_CEC_EDID=y
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
@ -4502,6 +4545,7 @@ CONFIG_DVB_NET=y
 CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set

 #
 # Media drivers
@ -4535,6 +4579,8 @@ CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_IR_SUNXI=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_MEDIA_USB_SUPPORT=y

 #
@ -4698,6 +4744,11 @@ CONFIG_VIDEO_EM28XX_RC=m
 CONFIG_USB_AIRSPY=m
 CONFIG_USB_HACKRF=m
 CONFIG_USB_MSI2500=m
+
+#
+# USB HDMI CEC adapters
+#
+CONFIG_USB_PULSE8_CEC=m
 CONFIG_MEDIA_PCI_SUPPORT=y

 #
@ -4792,12 +4843,16 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 # CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
-# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 # CONFIG_VIDEO_SH_VEU is not set
 CONFIG_VIDEO_TI_VPE=m
 # CONFIG_VIDEO_TI_VPE_DEBUG is not set
+CONFIG_VIDEO_TI_VPDMA=m
+CONFIG_VIDEO_TI_SC=m
+CONFIG_VIDEO_TI_CSC=m
 CONFIG_V4L_TEST_DRIVERS=y
 CONFIG_VIDEO_VIVID=m
+# CONFIG_VIDEO_VIVID_CEC is not set
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
 # CONFIG_VIDEO_VIM2M is not set
 CONFIG_DVB_PLATFORM_DRIVERS=y
@ -5146,6 +5201,7 @@ CONFIG_IMX_IPUV3_CORE=m
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DEBUG_MM is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
@ -5203,7 +5259,6 @@ CONFIG_DRM_EXYNOS_HDMI=y
 CONFIG_DRM_EXYNOS_IPP=y
 CONFIG_DRM_EXYNOS_FIMC=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
-# CONFIG_DRM_EXYNOS_GSC is not set
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_ANALOGIX_DP=m
 CONFIG_ROCKCHIP_DW_HDMI=m
@ -5276,15 +5331,19 @@ CONFIG_DRM_BRIDGE=y
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_ANX78XX=m
-# CONFIG_DRM_DUMB_VGA_DAC is not set
+CONFIG_DRM_DUMB_VGA_DAC=m
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_NXP_PTN3460=y
 CONFIG_DRM_PARADE_PS8622=y
+# CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_SII902X is not set
 # CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TI_TFP410 is not set
 CONFIG_DRM_ANALOGIX_DP=m
 CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7533=y
 # CONFIG_DRM_STI is not set
 CONFIG_DRM_IMX=m
@ -5297,8 +5356,11 @@ CONFIG_DRM_VC4=m
 CONFIG_DRM_ETNAVIV=m
 # CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
 # CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_HISI_HIBMC is not set
+CONFIG_DRM_MXS=y
+CONFIG_DRM_MXSFB=m
+# CONFIG_DRM_MESON is not set
 # CONFIG_DRM_LEGACY is not set
-# CONFIG_DRM_TINYDRM is not set

 #
 # Frame buffer Devices
@ -5643,6 +5705,7 @@ CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 # Allwinner SoC Audio support
 #
 CONFIG_SND_SUN4I_CODEC=m
+CONFIG_SND_SUN8I_CODEC_ANALOG=m
 CONFIG_SND_SUN4I_I2S=m
 CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SOC_TEGRA=m
@ -5681,6 +5744,8 @@ CONFIG_SND_SOC_ALC5632=m
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS42L42 is not set
 CONFIG_SND_SOC_CS42L51=m
 # CONFIG_SND_SOC_CS42L51_I2C is not set
 # CONFIG_SND_SOC_CS42L52 is not set
@ -5704,6 +5769,7 @@ CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98095=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X_SPI is not set
@ -5830,6 +5896,7 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MAYFLASH=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
@ -5865,6 +5932,7 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@ -6026,7 +6094,6 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 #
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_EXYNOS=y
-CONFIG_USB_DWC3_PCI=y
 CONFIG_USB_DWC3_KEYSTONE=y
 CONFIG_USB_DWC3_OF_SIMPLE=y
 CONFIG_USB_DWC2=y
@ -6074,6 +6141,7 @@ CONFIG_USB_SERIAL_IR=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IUU=m
@ -6246,10 +6314,6 @@ CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_PWRSEQ_EMMC=y
 CONFIG_PWRSEQ_SIMPLE=y
-
-#
-# MMC/SD/SDIO Card Drivers
-#
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=16
 CONFIG_MMC_BLOCK_BOUNCE=y
@ -6268,6 +6332,7 @@ CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y
 CONFIG_MMC_SDHCI_OF_AT91=y
 CONFIG_MMC_SDHCI_OF_ESDHC=y
+CONFIG_MMC_SDHCI_CADENCE=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_DOVE=y
 CONFIG_MMC_SDHCI_TEGRA=y
@ -6276,6 +6341,7 @@ CONFIG_MMC_SDHCI_PXAV3=y
 CONFIG_MMC_SDHCI_S3C_DMA=y
 CONFIG_MMC_SDHCI_F_SDH30=y
 CONFIG_MMC_SDHCI_IPROC=y
+CONFIG_MMC_MESON_GX=y
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_MXC=y
@ -6346,7 +6412,7 @@ CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_NS2=y
+CONFIG_LEDS_NS2=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
 CONFIG_LEDS_MAX77693=m
@ -6361,6 +6427,7 @@ CONFIG_LEDS_IS31FL32XX=m
 #
 CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_USER=m

 #
 # LED Triggers
@ -6554,6 +6621,7 @@ CONFIG_RTC_DRV_MC13XXX=y
 CONFIG_RTC_DRV_TEGRA=y
 CONFIG_RTC_DRV_MXC=y
 CONFIG_RTC_DRV_SNVS=y
+# CONFIG_RTC_DRV_R7301 is not set

 #
 # HID Sensor RTC drivers
@ -6607,7 +6675,8 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 # DMABUF options
 #
-# CONFIG_SYNC_FILE is not set
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
@ -6663,7 +6732,6 @@ CONFIG_ADIS16201=m
 CONFIG_ADIS16203=m
 CONFIG_ADIS16209=m
 CONFIG_ADIS16240=m
-CONFIG_SCA3000=m

 #
 # Analog to digital converters
@ -6709,9 +6777,7 @@ CONFIG_AD5933=m
 #
 # Light sensors
 #
-CONFIG_SENSORS_ISL29018=m
 CONFIG_SENSORS_ISL29028=m
-CONFIG_TSL2583=m
 # CONFIG_TSL2x7x is not set

 #
@ -6749,15 +6815,13 @@ CONFIG_NVEC_POWER=m
 CONFIG_NVEC_PAZ00=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
-# CONFIG_MEDIA_CEC is not set
 CONFIG_DVB_CXD2099=m
 CONFIG_VIDEO_OMAP4=m
+CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_ZILOG=m

@ -6821,6 +6885,7 @@ CONFIG_WILC1000_SPI=m
 # CONFIG_MOST is not set
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
+CONFIG_BCM2835_VCHIQ=y
 # CONFIG_GOLDFISH is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CROS_EC_CHARDEV=y
@ -6853,6 +6918,13 @@ CONFIG_COMMON_CLK_PALMAS=y
 CONFIG_COMMON_CLK_PWM=y
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_PIC32 is not set
+# CONFIG_COMMON_CLK_MT2701 is not set
+# CONFIG_COMMON_CLK_MT2701_MMSYS is not set
+# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set
+# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set
+# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
+# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
+# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
 CONFIG_COMMON_CLK_AMLOGIC=y
 CONFIG_COMMON_CLK_MESON8B=y
 CONFIG_MVEBU_CLK_COMMON=y
@ -6878,6 +6950,7 @@ CONFIG_SUNXI_CCU_NKM=y
 CONFIG_SUNXI_CCU_NKMP=y
 CONFIG_SUNXI_CCU_NM=y
 CONFIG_SUNXI_CCU_MP=y
+# CONFIG_SUN50I_A64_CCU is not set
 CONFIG_SUN6I_A31_CCU=y
 CONFIG_SUN8I_A23_CCU=y
 CONFIG_SUN8I_A33_CCU=y
@ -6960,7 +7033,6 @@ CONFIG_ARM_SMMU=y
 #
 CONFIG_REMOTEPROC=y
 CONFIG_OMAP_REMOTEPROC=m
-# CONFIG_STE_MODEM_RPROC is not set
 CONFIG_WKUP_M3_RPROC=y

 #
@ -6978,6 +7050,7 @@ CONFIG_RPMSG_VIRTIO=m
 #
 CONFIG_RASPBERRYPI_POWER=y
 # CONFIG_SOC_BRCMSTB is not set
+CONFIG_FSL_GUTS=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_SOC_SAMSUNG=y
 CONFIG_EXYNOS_PMU=y
@ -7061,8 +7134,11 @@ CONFIG_BMA220=m
 CONFIG_BMC150_ACCEL=m
 CONFIG_BMC150_ACCEL_I2C=m
 CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
 CONFIG_DMARD06=m
 CONFIG_DMARD09=m
+CONFIG_DMARD10=m
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
@ -7082,6 +7158,7 @@ CONFIG_MMA9551=m
 CONFIG_MMA9553=m
 CONFIG_MXC4005=m
 CONFIG_MXC6255=m
+CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m

@ -7093,6 +7170,7 @@ CONFIG_AD7266=m
 CONFIG_AD7291=m
 CONFIG_AD7298=m
 CONFIG_AD7476=m
+CONFIG_AD7766=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@ -7100,6 +7178,7 @@ CONFIG_AD7923=m
 CONFIG_AD799X=m
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
+CONFIG_ENVELOPE_DETECTOR=m
 CONFIG_EXYNOS_ADC=m
 CONFIG_HI8435=m
 CONFIG_INA2XX_ADC=m
@ -7137,6 +7216,8 @@ CONFIG_AD8366=m
 CONFIG_ATLAS_PH_SENSOR=m
 CONFIG_IAQCORE=m
 CONFIG_VZ89X=m
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m

 #
 # Hid Sensor IIO Common
@ -7154,6 +7235,10 @@ CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m

+#
+# Counters
+#
+
 #
 # Digital to analog converters
 #
@ -7175,6 +7260,7 @@ CONFIG_AD5764=m
 CONFIG_AD5791=m
 CONFIG_AD7303=m
 CONFIG_AD8801=m
+CONFIG_DPOT_DAC=m
 CONFIG_M62332=m
 CONFIG_MAX517=m
 CONFIG_MAX5821=m
@ -7235,6 +7321,9 @@ CONFIG_MAX30100=m
 CONFIG_AM2315=m
 CONFIG_DHT11=m
 CONFIG_HDC100X=m
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
@ -7268,6 +7357,7 @@ CONFIG_CM3232=m
 CONFIG_CM3323=m
 CONFIG_CM36651=m
 CONFIG_GP2AP020A00F=m
+CONFIG_SENSORS_ISL29018=m
 CONFIG_ISL29125=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_PROX=m
@ -7282,6 +7372,7 @@ CONFIG_STK3310=m
 CONFIG_TCS3414=m
 CONFIG_TCS3472=m
 CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
 CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
@ -7329,9 +7420,15 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_TPL0102=m

+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+
 #
 # Pressure sensors
 #
+CONFIG_ABP060MG=m
 CONFIG_BMP280=m
 CONFIG_BMP280_I2C=m
 CONFIG_BMP280_SPI=m
@ -7420,6 +7517,7 @@ CONFIG_RESET_SOCFPGA=y
 CONFIG_RESET_SUNXI=y
 CONFIG_TI_SYSCON_RESET=y
 CONFIG_RESET_ZYNQ=y
+# CONFIG_RESET_TEGRA_BPMP is not set
 # CONFIG_FMC is not set

 #
@ -7454,6 +7552,7 @@ CONFIG_PHY_ROCKCHIP_PCIE=y
 CONFIG_PHY_ROCKCHIP_TYPEC=y
 # CONFIG_PHY_TUSB1210 is not set
 CONFIG_PHY_TEGRA_XUSB=y
+CONFIG_PHY_MESON8B_USB2=y
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set

@ -7462,7 +7561,6 @@ CONFIG_PHY_TEGRA_XUSB=y
 #
 CONFIG_ARM_PMU=y
 CONFIG_RAS=y
-# CONFIG_THUNDERBOLT is not set

 #
 # Android
@ -7482,18 +7580,29 @@ CONFIG_NVMEM_VF610_OCOTP=y
 # FPGA Configuration Support
 #
 CONFIG_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FPGA_MGR_SOCFPGA=m
+CONFIG_FPGA_MGR_SOCFPGA_A10=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_BRIDGE=m
+CONFIG_SOCFPGA_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m

 #
 # Firmware Drivers
 #
 CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_HAVE_ARM_SMCCC=y

+#
+# Tegra firmware driver
+#
+# CONFIG_TEGRA_IVC is not set
+
 #
 # File systems
 #
@ -7567,6 +7676,7 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=y
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set

 #
 # Caches
@ -7633,7 +7743,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
-CONFIG_LOGFS=m
+# CONFIG_UBIFS_FS_ENCRYPTION is not set
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_FILE_CACHE=y
@ -7793,6 +7903,7 @@ CONFIG_NLS_UTF8=m
 # printk and dmesg options
 #
 CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_DYNAMIC_DEBUG is not set
@ -7933,6 +8044,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_KGDB=y
@ -8020,6 +8132,7 @@ CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=m
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=m
+CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_RSA=m
 CONFIG_CRYPTO_DH=m
 CONFIG_CRYPTO_ECDH=m
@ -8036,7 +8149,7 @@ CONFIG_CRYPTO_CRYPTD=m
 # CONFIG_CRYPTO_MCRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_ABLK_HELPER=m
+CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_ENGINE=m

 #
@ -8152,6 +8265,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
 CONFIG_CRYPTO_DEV_FSL_CAAM_IMX=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
@ -8162,6 +8276,7 @@ CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 # CONFIG_CRYPTO_DEV_CHELSIO is not set
+CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
 CONFIG_X509_CERTIFICATE_PARSER=m
@ -8182,6 +8297,8 @@ CONFIG_CRYPTO_AES_ARM=y
 CONFIG_CRYPTO_AES_ARM_BS=m
 # CONFIG_CRYPTO_AES_ARM_CE is not set
 # CONFIG_CRYPTO_GHASH_ARM_CE is not set
+# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
+# CONFIG_CRYPTO_CRC32_ARM_CE is not set
 # CONFIG_BINARY_PRINTF is not set

 #
@ -8242,7 +8359,6 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y