diff --git 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
index a48aeb5a9..ea75da833 100644
--- 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,4 +1,4 @@
-From cfaf96614497debcf1bc54ed9b4c45678eee282e Mon Sep 17 00:00:00 2001
+From 7b92cb52c51053c98e4e9b51f1cbdf87378562cb Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
 Subject: [PATCH 01/13] ARM: atags: add support for Marvell's u-boot
@@ -47,5 +47,5 @@ index 6b335a9ff8c8..614150b53643 100644
  };
  
 -- 
-2.16.2
+2.17.1
 
diff --git 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
index 8e09349dc..19ff664b6 100644
--- 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,4 +1,4 @@
-From e47ba83e454cf97a7b3d33e5b5b625682ae1cd49 Mon Sep 17 00:00:00 2001
+From b8a9d378bcb16978a7ab0ec75d66ed1604aca79f Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
 Subject: [PATCH 02/13] ARM: atags/fdt: retrieve MAC addresses from Marvell
@@ -43,5 +43,5 @@ index 41fa7316c52b..807ed160a4b9 100644
  	}
  
 -- 
-2.16.2
+2.17.1
 
diff --git a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch b/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch
index 7b556c79b..6a7122ac5 100644
--- 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,4 +1,4 @@
-From 51132fdfa4b66feb87499903f568132b7ec92785 Mon Sep 17 00:00:00 2001
+From 29007246e1a081c7675fc4b6f16e4566b10f325c Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:41:19 -0600
 Subject: [PATCH 03/13] SMILE Plug device tree file
@@ -9,15 +9,15 @@ dts with the LED definitions.
 Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 ---
  arch/arm/boot/dts/Makefile                 |   1 +
- arch/arm/boot/dts/armada-370-smileplug.dts | 173 +++++++++++++++++++++++++++++
+ arch/arm/boot/dts/armada-370-smileplug.dts | 173 +++++++++++++++++++++
  2 files changed, 174 insertions(+)
  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 ade7a38543dc..4bd5a6614e93 100644
+index 37a3de760d40..823a9ef2675d 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1072,6 +1072,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -1115,6 +1115,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
  	armada-370-db.dtb \
  	armada-370-dlink-dns327l.dtb \
  	armada-370-mirabox.dtb \
@@ -205,5 +205,5 @@ index 000000000000..d01308ab848b
 +	};
 +};
 -- 
-2.16.2
+2.17.1
 
diff --git a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch b/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch
index a91e7574c..7c8b2eac9 100644
--- a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch
+++ b/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch
@@ -1,4 +1,4 @@
-From ab62597d0e8a83ba11af33f294a58b4462e9369a Mon Sep 17 00:00:00 2001
+From ddc12ee4c0f18e70b485bff20a441c6cacf29b5c Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
 Subject: [PATCH 04/13] fix mvsdio eMMC timing
@@ -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 210247b3d11a..1a1802dc9ef4 100644
+index e22bbff89c8d..6b30c850ce07 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)
@@ -24,7 +24,7 @@ index 210247b3d11a..1a1802dc9ef4 100644
  		tmout_index = MVSD_HOST_CTRL_TMOUT_MAX;
  
  	dev_dbg(host->dev, "data %s at 0x%08x: blocks=%d blksz=%d tmout=%u (%d)\n",
-@@ -614,6 +614,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+@@ -616,6 +616,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
  		u32 m = DIV_ROUND_UP(host->base_clock, ios->clock) - 1;
  		if (m > MVSD_BASE_DIV_MAX)
  			m = MVSD_BASE_DIV_MAX;
@@ -34,5 +34,5 @@ index 210247b3d11a..1a1802dc9ef4 100644
  		host->clock = ios->clock;
  		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.16.2
+2.17.1
 
diff --git 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
index 1352c0d1d..c2f8ef23d 100644
--- 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,15 +1,15 @@
-From 8bb2616581e4e5aa7395bec730995629be259954 Mon Sep 17 00:00:00 2001
+From 5f45e27db60d50da68c2288f274be2835f057114 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
 Subject: [PATCH 05/13] net/smsc95xx: Allow mac address to be set as a
  parameter
 
 ---
- drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
+ 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 309b88acd3d0..7bc9feb891a1 100644
+index 06b4d290784d..3be3b5a4a176 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -60,6 +60,7 @@
@@ -92,5 +92,5 @@ index 309b88acd3d0..7bc9feb891a1 100644
  
  	/* maybe the boot loader passed the MAC address in devicetree */
 -- 
-2.16.2
+2.17.1
 
diff --git a/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch b/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch
index 9f593508e..0d15c4196 100644
--- a/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch
+++ b/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch
@@ -1,4 +1,4 @@
-From 877e229054b1ecdcb350356475f2654e66c13288 Mon Sep 17 00:00:00 2001
+From 8a6b26a12dda9ec5efed9f4a0b1bfd393c77cd5e Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
 Subject: [PATCH 06/13] set default cubietruck led triggers
@@ -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 8c9bedc602ec..b3a765ba03fd 100644
+index 5649161de1d7..2be64a886555 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 @@ -80,6 +80,7 @@
@@ -29,5 +29,5 @@ index 8c9bedc602ec..b3a765ba03fd 100644
  	};
  
 -- 
-2.16.2
+2.17.1
 
diff --git a/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
index 9ea37c85b..0d5dc96cc 100644
--- a/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+++ b/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
@@ -1,4 +1,4 @@
-From 75c68a3a6868e6e0891e807b51249523bdfae611 Mon Sep 17 00:00:00 2001
+From 78becd54a7e941d7de7d8c1ff98cd410701fc60f Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 11 Aug 2016 00:42:37 -0600
 Subject: [PATCH 07/13] exynos4412-odroid: set higher minimum buck2 regulator
@@ -13,10 +13,10 @@ 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 556ea78b8e32..f3a3fe4af289 100644
+index a09e46c9dbc0..d8117a820812 100644
 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-@@ -418,7 +418,7 @@
+@@ -423,7 +423,7 @@
  
  			buck2_reg: BUCK2 {
  				regulator-name = "vdd_arm";
@@ -26,5 +26,5 @@ index 556ea78b8e32..f3a3fe4af289 100644
  				regulator-always-on;
  				regulator-boot-on;
 -- 
-2.16.2
+2.17.1
 
diff --git a/core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch b/core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
index d7acb09af..89f85e748 100644
--- a/core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
+++ b/core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
@@ -1,4 +1,4 @@
-From 728f5a9864ab09dd0485102e62ff6d4483c184fc Mon Sep 17 00:00:00 2001
+From 82f3c593297ef6f08f5fc5b01dcf58fe962e2455 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 7 May 2017 13:32:25 -0600
 Subject: [PATCH 08/13] ARM: dove: enable ethernet on D3Plug
@@ -27,5 +27,5 @@ index 826026c28f90..a4c9963e1261 100644
  /* Samsung M8G2F eMMC */
  &sdio0 {
 -- 
-2.16.2
+2.17.1
 
diff --git a/core/linux-armv7-rc/0009-power-add-power-sequence-library.patch b/core/linux-armv7-rc/0009-power-add-power-sequence-library.patch
index 049ba39ce..b5a7b72cb 100644
--- a/core/linux-armv7-rc/0009-power-add-power-sequence-library.patch
+++ b/core/linux-armv7-rc/0009-power-add-power-sequence-library.patch
@@ -1,4 +1,4 @@
-From 4ab3153b568ce58a01e0e379ffe8061c4f0435b6 Mon Sep 17 00:00:00 2001
+From 66ab9eb562e519c47ead6ff7d5ad066896d2f2be Mon Sep 17 00:00:00 2001
 From: Peter Chen <peter.chen@nxp.com>
 Date: Wed, 21 Jun 2017 14:42:03 +0800
 Subject: [PATCH 09/13] power: add power sequence library
@@ -31,15 +31,15 @@ Tested-by Joshua Clayton <stillcompiling@gmail.com>
 Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
 Tested-by: Matthias Kaehlcke <mka@chromium.org>
 ---
- Documentation/power/power-sequence/design.rst |  54 +++++
+ Documentation/power/power-sequence/design.rst |  54 ++++
  MAINTAINERS                                   |   9 +
  drivers/power/Kconfig                         |   1 +
  drivers/power/Makefile                        |   1 +
  drivers/power/pwrseq/Kconfig                  |  20 ++
  drivers/power/pwrseq/Makefile                 |   2 +
- drivers/power/pwrseq/core.c                   | 293 ++++++++++++++++++++++++++
- drivers/power/pwrseq/pwrseq_generic.c         | 210 ++++++++++++++++++
- include/linux/power/pwrseq.h                  |  84 ++++++++
+ drivers/power/pwrseq/core.c                   | 293 ++++++++++++++++++
+ drivers/power/pwrseq/pwrseq_generic.c         | 210 +++++++++++++
+ include/linux/power/pwrseq.h                  |  84 +++++
  9 files changed, 674 insertions(+)
  create mode 100644 Documentation/power/power-sequence/design.rst
  create mode 100644 drivers/power/pwrseq/Kconfig
@@ -109,10 +109,10 @@ index 000000000000..554608e5f3b6
 +.. kernel-doc:: drivers/power/pwrseq/core.c
 +   :export:
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 4623caf8d72d..7569287f8b33 100644
+index 9d5eeff51b5f..3681cf91532d 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -11086,6 +11086,15 @@ F:	drivers/firmware/psci*.c
+@@ -11393,6 +11393,15 @@ F:	drivers/firmware/psci*.c
  F:	include/linux/psci.h
  F:	include/uapi/linux/psci.h
  
@@ -786,5 +786,5 @@ index 000000000000..c5b278f5f2ae
 +
 +#endif  /* __LINUX_PWRSEQ_H */
 -- 
-2.16.2
+2.17.1
 
diff --git a/core/linux-armv7-rc/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch b/core/linux-armv7-rc/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch
index 77b0f0b46..847550406 100644
--- a/core/linux-armv7-rc/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch
+++ b/core/linux-armv7-rc/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch
@@ -1,4 +1,4 @@
-From 939bdab48c863e3f6ab60b4397a8467e05bc2ace Mon Sep 17 00:00:00 2001
+From aca7089b9a244be44b76d4021fb38fb9ba78d5bd Mon Sep 17 00:00:00 2001
 From: Peter Chen <peter.chen@nxp.com>
 Date: Wed, 21 Jun 2017 14:42:05 +0800
 Subject: [PATCH 10/13] usb: core: add power sequence handling for USB devices
@@ -22,12 +22,12 @@ Reviewed-by: Vaibhav Hiremath <hvaibhav.linux@gmail.com>
 Acked-by: Alan Stern <stern@rowland.harvard.edu>
 ---
  drivers/usb/Kconfig    |  1 +
- drivers/usb/core/hub.c | 49 +++++++++++++++++++++++++++++++++++++++++++++----
+ drivers/usb/core/hub.c | 49 ++++++++++++++++++++++++++++++++++++++----
  drivers/usb/core/hub.h |  1 +
  3 files changed, 47 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
-index 148f3ee70286..575a866422be 100644
+index 987fc5ba6321..bd09fc8ff763 100644
 --- a/drivers/usb/Kconfig
 +++ b/drivers/usb/Kconfig
 @@ -45,6 +45,7 @@ config USB
@@ -39,7 +39,7 @@ index 148f3ee70286..575a866422be 100644
  	---help---
  	  Universal Serial Bus (USB) is a specification for a serial bus
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index c5c1f6cf3228..a7de648c3f76 100644
+index fcae521df29b..0c708d3ef179 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
 @@ -28,6 +28,7 @@
@@ -50,7 +50,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
  
  #include <linux/uaccess.h>
  #include <asm/byteorder.h>
-@@ -1649,6 +1650,7 @@ static void hub_disconnect(struct usb_interface *intf)
+@@ -1654,6 +1655,7 @@ static void hub_disconnect(struct usb_interface *intf)
  	hub->error = 0;
  	hub_quiesce(hub, HUB_DISCONNECT);
  
@@ -58,7 +58,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
  	mutex_lock(&usb_port_peer_mutex);
  
  	/* Avoid races with recursively_mark_NOTATTACHED() */
-@@ -1695,11 +1697,41 @@ static bool hub_descriptor_is_sane(struct usb_host_interface *desc)
+@@ -1700,11 +1702,41 @@ static bool hub_descriptor_is_sane(struct usb_host_interface *desc)
          return true;
  }
  
@@ -100,7 +100,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
  
  	desc = intf->cur_altsetting;
  	hdev = interface_to_usbdev(intf);
-@@ -1790,6 +1822,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
+@@ -1795,6 +1827,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
  	INIT_DELAYED_WORK(&hub->leds, led_work);
  	INIT_DELAYED_WORK(&hub->init_work, NULL);
  	INIT_WORK(&hub->events, hub_event);
@@ -108,7 +108,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
  	usb_get_intf(intf);
  	usb_get_dev(hdev);
  
-@@ -1803,11 +1836,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
+@@ -1808,11 +1841,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
  	if (id->driver_info & HUB_QUIRK_CHECK_PORT_AUTOSUSPEND)
  		hub->quirk_check_port_auto_suspend = 1;
  
@@ -126,7 +126,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
  }
  
  static int
-@@ -3621,14 +3657,19 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
+@@ -3653,14 +3689,19 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
  
  	/* stop hub_wq and related activity */
  	hub_quiesce(hub, HUB_SUSPEND);
@@ -148,7 +148,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
  	return 0;
  }
 diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
-index 2a700ccc868c..3a0e6e6b22b0 100644
+index 4accfb63f7dc..abe71c5e84cb 100644
 --- a/drivers/usb/core/hub.h
 +++ b/drivers/usb/core/hub.h
 @@ -70,6 +70,7 @@ struct usb_hub {
@@ -160,5 +160,5 @@ index 2a700ccc868c..3a0e6e6b22b0 100644
  
  /**
 -- 
-2.16.2
+2.17.1
 
diff --git a/core/linux-armv7-rc/0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch b/core/linux-armv7-rc/0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch
index 6fdb44623..adeba8aac 100644
--- a/core/linux-armv7-rc/0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch
+++ b/core/linux-armv7-rc/0011-ARM-dts-imx6qdl-Enable-usb-node-children-with-reg.patch
@@ -1,4 +1,4 @@
-From 1392b78fdeca809beb269413d788a864c4f2f261 Mon Sep 17 00:00:00 2001
+From eb5b8019af89ca315bbe6cd9d9e89a2f4d73a953 Mon Sep 17 00:00:00 2001
 From: Joshua Clayton <stillcompiling@gmail.com>
 Date: Wed, 21 Jun 2017 14:42:06 +0800
 Subject: [PATCH 11/13] ARM: dts: imx6qdl: Enable usb node children with <reg>
@@ -14,10 +14,10 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
-index 59ff86695a14..a4957bf2a82f 100644
+index 911141e24681..c74e9c7a83bf 100644
 --- a/arch/arm/boot/dts/imx6qdl.dtsi
 +++ b/arch/arm/boot/dts/imx6qdl.dtsi
-@@ -983,6 +983,8 @@
+@@ -965,6 +965,8 @@
  
  			usbh1: usb@2184200 {
  				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
@@ -26,7 +26,7 @@ index 59ff86695a14..a4957bf2a82f 100644
  				reg = <0x02184200 0x200>;
  				interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>;
  				clocks = <&clks IMX6QDL_CLK_USBOH3>;
-@@ -997,6 +999,8 @@
+@@ -979,6 +981,8 @@
  
  			usbh2: usb@2184400 {
  				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
@@ -35,7 +35,7 @@ index 59ff86695a14..a4957bf2a82f 100644
  				reg = <0x02184400 0x200>;
  				interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>;
  				clocks = <&clks IMX6QDL_CLK_USBOH3>;
-@@ -1010,6 +1014,8 @@
+@@ -992,6 +996,8 @@
  
  			usbh3: usb@2184600 {
  				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
@@ -45,5 +45,5 @@ index 59ff86695a14..a4957bf2a82f 100644
  				interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>;
  				clocks = <&clks IMX6QDL_CLK_USBOH3>;
 -- 
-2.16.2
+2.17.1
 
diff --git a/core/linux-armv7-rc/0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch b/core/linux-armv7-rc/0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch
index b651ea9da..2f9047aa4 100644
--- a/core/linux-armv7-rc/0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch
+++ b/core/linux-armv7-rc/0012-ARM-dts-imx6qdl-udoo.dtsi-fix-onboard-USB-HUB-proper.patch
@@ -1,4 +1,4 @@
-From bd2a35c39515f939b10d76c60cebafc621a4dcfd Mon Sep 17 00:00:00 2001
+From 47158daa865de05bcf0c0465c22e888514793cfe Mon Sep 17 00:00:00 2001
 From: Peter Chen <peter.chen@nxp.com>
 Date: Wed, 21 Jun 2017 14:42:07 +0800
 Subject: [PATCH 12/13] ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB
@@ -17,11 +17,11 @@ Tested-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
  1 file changed, 12 insertions(+), 14 deletions(-)
 
 diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
-index 4161b7d4323a..442a6d69ede8 100644
+index 4f27861bbb32..dead14b0d4bf 100644
 --- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi
 +++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
-@@ -9,6 +9,8 @@
-  *
+@@ -5,6 +5,8 @@
+  * Author: Fabio Estevam <fabio.estevam@freescale.com>
   */
  
 +#include <dt-bindings/gpio/gpio.h>
@@ -29,7 +29,7 @@ index 4161b7d4323a..442a6d69ede8 100644
  / {
  	aliases {
  		backlight = &backlight;
-@@ -65,17 +67,6 @@
+@@ -61,17 +63,6 @@
  		#address-cells = <1>;
  		#size-cells = <0>;
  
@@ -47,7 +47,7 @@ index 4161b7d4323a..442a6d69ede8 100644
  		reg_panel: regulator@1 {
  			compatible = "regulator-fixed";
  			reg = <1>;
-@@ -201,7 +192,7 @@
+@@ -197,7 +188,7 @@
  
  		pinctrl_usbh: usbhgrp {
  			fsl,pins = <
@@ -56,7 +56,7 @@ index 4161b7d4323a..442a6d69ede8 100644
  				MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x130b0
  			>;
  		};
-@@ -272,9 +263,16 @@
+@@ -268,9 +259,16 @@
  &usbh1 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&pinctrl_usbh>;
@@ -76,5 +76,5 @@ index 4161b7d4323a..442a6d69ede8 100644
  
  &usdhc3 {
 -- 
-2.16.2
+2.17.1
 
diff --git a/core/linux-armv7-rc/0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch b/core/linux-armv7-rc/0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch
index 22a85b1f0..d0edc9a5a 100644
--- a/core/linux-armv7-rc/0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch
+++ b/core/linux-armv7-rc/0013-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch
@@ -1,4 +1,4 @@
-From 160685d2e3325c31b65fec8d7635a5f82d22c073 Mon Sep 17 00:00:00 2001
+From b47f83652c32f2bb3d1d23c89eef170d3db28d07 Mon Sep 17 00:00:00 2001
 From: Joshua Clayton <stillcompiling@gmail.com>
 Date: Wed, 21 Jun 2017 14:42:08 +0800
 Subject: [PATCH 13/13] ARM: dts: imx6q-evi: Fix onboard hub reset line
@@ -15,7 +15,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
  1 file changed, 7 insertions(+), 18 deletions(-)
 
 diff --git a/arch/arm/boot/dts/imx6q-evi.dts b/arch/arm/boot/dts/imx6q-evi.dts
-index e0aea782c666..6f3afffc8faa 100644
+index fcd257bc5ac3..d32fa81bba95 100644
 --- a/arch/arm/boot/dts/imx6q-evi.dts
 +++ b/arch/arm/boot/dts/imx6q-evi.dts
 @@ -54,18 +54,6 @@
@@ -70,5 +70,5 @@ index e0aea782c666..6f3afffc8faa 100644
  		>;
  	};
 -- 
-2.16.2
+2.17.1
 
diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD
index 5bf86d05d..2ccaea3fb 100644
--- a/core/linux-armv7-rc/PKGBUILD
+++ b/core/linux-armv7-rc/PKGBUILD
@@ -3,8 +3,8 @@
 
 buildarch=4
 
-_rcver=4.17
-_rcrel=7
+_rcver=4.18
+_rcrel=1
 _rcnrel=armv7-x0
 
 pkgbase=linux-armv7-rc
@@ -39,22 +39,22 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
         'kernel_data_key.vbprivk'
         'linux.preset'
         '99-linux.hook')
-md5sums=('ecf0b54e056d67c7ea7c9bf4796ac0c3'
-         '67a272b50bc906973c8483cf22ee3bf2'
-         '38440ef4a8c52fae52c02e7b17698e9f'
-         '62016c2311ad894a145e2100074c5c65'
-         '7bb0eb2d0fb06666bedd4dc2cdbaa02c'
-         'ceb4743e81f96a78c7e6e9fdfae50ccb'
-         '3a9da57d484c6bcdcd620f0931827a24'
-         'd1ab6fc88aeb28013d496231b3c63682'
-         '6abeec83b3a5f5ea2676fe03ea97df73'
-         '10a0febbe2af946a12137cb574bd676b'
-         '966ddd9affd0237bf9fe7298eb26bfe5'
-         '32eed86641825eaed7e6f78c14cc19d8'
-         '21b75ae79dcb0994f7fd99f5062a8ef9'
-         '854888245f29013be06f762c6162a5b2'
-         '267d9dc5a1ec7232a2849cfad322209c'
-         'aac777b24191270b9bd2bcf3a77c0b8e'
+md5sums=('39b23099e1853bed44856843057dad56'
+         'e7d4aa0d8ec5fbdb7e93ec4590e4cd18'
+         'c4f74b028dfceb555d86d34e92da3edd'
+         '7f319acd7cb3d5ff5aa620515e8a98a4'
+         '43530e94207944841174e955907d775c'
+         '497955c1c289e46ab7cf2caa1fe778fc'
+         '75eb7af53e67fda79f11e676ed9bd420'
+         '578474a4c24ccde97bf20015db94d33f'
+         '0b089b0d41124e20aaae7c1739c95d64'
+         'a269d6f125aed69f3f5ae49ea9a1b200'
+         '70e42273935e8ca30df9c1870a60cf40'
+         '990e12857d2a436526e6a61ae84d7dcd'
+         '2a5e6f64473eeb367b68e24def0dd6f9'
+         '754247fc3b6d7300e30ae208a8212cfc'
+         '3b7e9848510efaccbc2c8daba28f8065'
+         'ae5869e0b821eafa0a768dd2efa0860f'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config
index 550fc6c64..75cc8c5e6 100644
--- a/core/linux-armv7-rc/config
+++ b/core/linux-armv7-rc/config
@@ -1,10 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.17.0-rc7-1 Kernel Configuration
+# Linux/arm 4.18.0-rc1-1 Kernel Configuration
+#
+
+#
+# Compiler: gcc (GCC) 8.1.0
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
-CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_MIGHT_HAVE_PCI=y
@@ -19,12 +22,14 @@ CONFIG_ARCH_HAS_BANDGAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIQ=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_GENERIC_BUG=y
 CONFIG_PGTABLE_LEVELS=2
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=80100
+CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 
@@ -32,7 +37,6 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 # General setup
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-ARCH"
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -198,6 +202,8 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
 # CONFIG_BPF_JIT_ALWAYS_ON is not set
 CONFIG_USERFAULTFD=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
 CONFIG_EMBEDDED=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
@@ -244,8 +250,8 @@ CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
 CONFIG_HAVE_CLK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
@@ -253,13 +259,13 @@ CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGINS is not set
-CONFIG_HAVE_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
-CONFIG_CC_STACKPROTECTOR_AUTO=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -450,7 +456,6 @@ CONFIG_SOC_EXYNOS5250=y
 CONFIG_SOC_EXYNOS5260=y
 CONFIG_SOC_EXYNOS5410=y
 CONFIG_SOC_EXYNOS5420=y
-CONFIG_SOC_EXYNOS5440=y
 CONFIG_SOC_EXYNOS5800=y
 CONFIG_EXYNOS5420_MCPM=y
 CONFIG_EXYNOS_CPU_SUSPEND=y
@@ -509,7 +514,6 @@ CONFIG_ARCH_KEYSTONE=y
 CONFIG_ARCH_MESON=y
 CONFIG_MACH_MESON6=y
 CONFIG_MACH_MESON8=y
-CONFIG_MACH_MESON8B=y
 # CONFIG_ARCH_MMP is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_MVEBU_ANY=y
@@ -535,7 +539,6 @@ CONFIG_POWER_AVS_OMAP_CLASS3=y
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
-CONFIG_OMAP_PM_NOOP=y
 CONFIG_MACH_OMAP_GENERIC=y
 
 #
@@ -637,6 +640,8 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_SPECTRE=y
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_VDSO=y
 CONFIG_OUTER_CACHE=y
@@ -684,8 +689,8 @@ CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_SYSCALL=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
@@ -706,10 +711,23 @@ CONFIG_PCI_ECAM=y
 # CONFIG_PCI_PASID is not set
 # CONFIG_HOTPLUG_PCI is not set
 
+#
+# PCI controller drivers
+#
+CONFIG_PCI_MVEBU=y
+
 #
 # Cadence PCIe controllers support
 #
 # CONFIG_PCIE_CADENCE_HOST is not set
+# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCI_TEGRA=y
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_XILINX=y
+# CONFIG_PCI_V3_SEMI is not set
+# CONFIG_PCIE_ALTERA is not set
+# CONFIG_PCIE_ROCKCHIP_HOST is not set
 
 #
 # DesignWare PCI Core Support
@@ -719,24 +737,12 @@ CONFIG_PCIE_DW_HOST=y
 CONFIG_PCI_DRA7XX=y
 CONFIG_PCI_DRA7XX_HOST=y
 CONFIG_PCIE_DW_PLAT=y
-# CONFIG_PCI_EXYNOS is not set
+CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_PCI_IMX6=y
 # CONFIG_PCI_KEYSTONE is not set
 # CONFIG_PCI_LAYERSCAPE is not set
 # CONFIG_PCIE_ARMADA_8K is not set
 
-#
-# PCI host controller drivers
-#
-CONFIG_PCI_MVEBU=y
-# CONFIG_PCI_FTPCI100 is not set
-CONFIG_PCI_TEGRA=y
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCIE_XILINX=y
-# CONFIG_PCI_V3_SEMI is not set
-# CONFIG_PCIE_ROCKCHIP is not set
-
 #
 # PCI Endpoint
 #
@@ -833,8 +839,6 @@ CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 CONFIG_SECCOMP=y
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
 # CONFIG_PARAVIRT is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_XEN is not set
@@ -891,7 +895,6 @@ CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
 CONFIG_ARM_DT_BL_CPUFREQ=y
 CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=y
-CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 CONFIG_ARM_IMX6Q_CPUFREQ=y
 # CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
 CONFIG_ARM_TEGRA20_CPUFREQ=y
@@ -987,6 +990,7 @@ CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 CONFIG_TLS=m
+# CONFIG_TLS_DEVICE is not set
 CONFIG_XFRM=y
 CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_ALGO=m
@@ -998,6 +1002,7 @@ CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 # CONFIG_SMC is not set
+# CONFIG_XDP_SOCKETS is not set
 CONFIG_INET=y
 CONFIG_WIREGUARD=m
 # CONFIG_WIREGUARD_DEBUG is not set
@@ -1093,6 +1098,7 @@ CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_BPF=y
 CONFIG_NETLABEL=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y
@@ -1152,14 +1158,12 @@ CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=m
+CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_OSF=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_META=m
-CONFIG_NFT_RT=m
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
@@ -1167,6 +1171,7 @@ CONFIG_NFT_SET_RBTREE=m
 CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_SET_BITMAP=m
 CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
@@ -1181,6 +1186,7 @@ CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_FIB=m
 CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_SOCKET=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -1320,6 +1326,7 @@ CONFIG_IP_VS_LBLC=m
 CONFIG_IP_VS_LBLCR=m
 CONFIG_IP_VS_DH=m
 CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
@@ -1328,6 +1335,11 @@ CONFIG_IP_VS_NQ=m
 #
 CONFIG_IP_VS_SH_TAB_BITS=8
 
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
 #
 # IPVS application helper
 #
@@ -1341,6 +1353,7 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
@@ -1354,7 +1367,7 @@ CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=m
+CONFIG_NF_NAT_MASQUERADE_IPV4=y
 CONFIG_NFT_MASQ_IPV4=m
 CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
@@ -1389,6 +1402,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_CHAIN_NAT_IPV6=m
@@ -1402,7 +1416,7 @@ CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_NF_NAT_MASQUERADE_IPV6=y
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1425,7 +1439,6 @@ CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
 CONFIG_NF_TABLES_BRIDGE=y
-CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
@@ -1449,6 +1462,8 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_BPFILTER=y
+CONFIG_BPFILTER_UMH=m
 CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
@@ -1887,6 +1902,8 @@ CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_DEVLINK=m
 CONFIG_MAY_USE_DEVLINK=m
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
 CONFIG_HAVE_EBPF_JIT=y
 
 #
@@ -1903,6 +1920,10 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE="am335x-pm-firmware.elf am335x-bone-scale-data.bin am335x-evm-scale-data.bin am43x-evm-scale-data.bin"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
@@ -2116,6 +2137,7 @@ CONFIG_CDROM=y
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV_LOOP=y
@@ -2477,6 +2499,7 @@ CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
 CONFIG_DM_ERA=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -2622,10 +2645,6 @@ CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
 # CONFIG_NET_VENDOR_AURORA is not set
-CONFIG_NET_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
-# CONFIG_MACB_PCI is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_B44 is not set
 # CONFIG_BCMGENET is not set
@@ -2640,6 +2659,10 @@ CONFIG_BNXT_FLOWER_OFFLOAD=y
 # CONFIG_BNXT_DCB is not set
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
+CONFIG_NET_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+# CONFIG_MACB_PCI is not set
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
@@ -2678,10 +2701,6 @@ CONFIG_BE2NET=m
 CONFIG_BE2NET_HWMON=y
 CONFIG_NET_VENDOR_EZCHIP=y
 # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_NET_VENDOR_FARADAY=y
 # CONFIG_FTMAC100 is not set
 # CONFIG_FTGMAC100 is not set
@@ -2701,6 +2720,7 @@ CONFIG_NET_VENDOR_HISILICON=y
 CONFIG_NET_VENDOR_HP=y
 # CONFIG_HP100 is not set
 CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_E100=m
 CONFIG_E1000=m
@@ -2718,7 +2738,10 @@ CONFIG_I40E_DCB=y
 CONFIG_I40EVF=m
 # CONFIG_ICE is not set
 # CONFIG_FM10K is not set
-CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MV643XX_ETH=y
@@ -2757,6 +2780,8 @@ CONFIG_ENC28J60=m
 # CONFIG_ENC28J60_WRITEVERIFY is not set
 CONFIG_ENCX24J600=m
 # CONFIG_LAN743X is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+# CONFIG_MSCC_OCELOT_SWITCH is not set
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
@@ -2791,6 +2816,8 @@ CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_UART is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_RMNET is not set
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
@@ -2800,24 +2827,22 @@ CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
 CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
 CONFIG_NET_VENDOR_ROCKER=y
 # CONFIG_ROCKER is not set
 CONFIG_NET_VENDOR_SAMSUNG=y
 # CONFIG_SXGBE_ETH is not set
 CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-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_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_EPIC100=m
@@ -2841,6 +2866,8 @@ CONFIG_NET_VENDOR_SUN=y
 # CONFIG_SUNGEM is not set
 CONFIG_CASSINI=m
 CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
@@ -2865,8 +2892,6 @@ CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100_SPI=m
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_DWC_XLGMAC is not set
 CONFIG_FDDI=m
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
@@ -2880,6 +2905,7 @@ CONFIG_MDIO_BUS_MUX=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
 CONFIG_MDIO_SUN4I=m
 CONFIG_PHYLINK=m
 CONFIG_PHYLIB=y
@@ -2892,6 +2918,7 @@ CONFIG_LED_TRIGGER_PHY=y
 # CONFIG_SFP is not set
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
+# CONFIG_ASIX_PHY is not set
 CONFIG_AT803X_PHY=m
 CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m
@@ -2901,6 +2928,7 @@ CONFIG_CICADA_PHY=m
 # CONFIG_CORTINA_PHY is not set
 CONFIG_DAVICOM_PHY=m
 # CONFIG_DP83822_PHY is not set
+# CONFIG_DP83TC811_PHY is not set
 CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=m
 CONFIG_FIXED_PHY=y
@@ -2913,6 +2941,7 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_MESON_GXL_PHY is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
+# CONFIG_MICROCHIP_T1_PHY is not set
 # CONFIG_MICROSEMI_PHY is not set
 CONFIG_NATIONAL_PHY=m
 CONFIG_QSEMI_PHY=m
@@ -3024,6 +3053,7 @@ CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
 CONFIG_WIL6210_DEBUGFS=y
 CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
 CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_AHB is not set
 # CONFIG_ATH10K_SDIO is not set
@@ -3242,6 +3272,7 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_MCR20A is not set
 # CONFIG_VMXNET3 is not set
 # CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
 # CONFIG_NVM is not set
 
@@ -3306,7 +3337,20 @@ CONFIG_KEYBOARD_CROS_EC=y
 CONFIG_KEYBOARD_CAP11XX=m
 CONFIG_KEYBOARD_BCM=m
 CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
@@ -3524,7 +3568,7 @@ CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=y
 CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
+CONFIG_SERIO_LIBPS2=m
 # CONFIG_SERIO_RAW is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_SERIO_PS2MULT is not set
@@ -3768,6 +3812,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SPI=y
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
 
 #
 # SPI Master Controller Drivers
@@ -3850,7 +3895,7 @@ CONFIG_PPS_CLIENT_GPIO=m
 # PTP clock support
 #
 CONFIG_PTP_1588_CLOCK=y
-CONFIG_PTP_1588_CLOCK_GIANFAR=m
+CONFIG_PTP_1588_CLOCK_QORIQ=m
 
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
@@ -3894,7 +3939,6 @@ CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS_ARM=y
-CONFIG_PINCTRL_EXYNOS5440=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_SUN4I_A10=y
 CONFIG_PINCTRL_SUN5I=y
@@ -3923,6 +3967,7 @@ CONFIG_PINCTRL_MESON8B=y
 CONFIG_PINCTRL_MESON8_PMX=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
 CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
@@ -4590,6 +4635,7 @@ CONFIG_REGULATOR_S2MPA01=y
 CONFIG_REGULATOR_S2MPS11=y
 CONFIG_REGULATOR_S5M8767=y
 CONFIG_REGULATOR_TI_ABB=y
+# CONFIG_REGULATOR_SY8106A is not set
 CONFIG_REGULATOR_TPS51632=y
 CONFIG_REGULATOR_TPS62360=y
 CONFIG_REGULATOR_TPS65023=y
@@ -4673,7 +4719,6 @@ CONFIG_V4L2_FWNODE=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
 CONFIG_DVB_CORE=y
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_NET=y
@@ -4929,6 +4974,7 @@ CONFIG_DVB_SMIPCIE=m
 CONFIG_DVB_NETUP_UNIDVB=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_CAFE_CCIC=m
+# CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_OMAP3=m
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
@@ -5165,6 +5211,7 @@ CONFIG_MEDIA_TUNER_IT913X=m
 CONFIG_MEDIA_TUNER_R820T=m
 CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
 
 #
 # Multistandard (satellite) frontends
@@ -5323,6 +5370,7 @@ CONFIG_DVB_SP2=m
 #
 # Tools to develop new frontends
 #
+CONFIG_DVB_DUMMY_FE=m
 
 #
 # Graphics support
@@ -5336,7 +5384,7 @@ CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
+# CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
@@ -5355,6 +5403,7 @@ CONFIG_DRM_I2C_ADIHDMI=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
 CONFIG_DRM_ARM=y
 # CONFIG_DRM_HDLCD is not set
 CONFIG_DRM_MALI_DISPLAY=m
@@ -5398,6 +5447,9 @@ CONFIG_DRM_EXYNOS_HDMI=y
 # Sub-drivers
 #
 # CONFIG_DRM_EXYNOS_G2D is not set
+# CONFIG_DRM_EXYNOS_FIMC is not set
+# CONFIG_DRM_EXYNOS_ROTATOR is not set
+# CONFIG_DRM_EXYNOS_SCALER is not set
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 # CONFIG_ROCKCHIP_CDN_DP is not set
@@ -5416,6 +5468,7 @@ CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
 CONFIG_DRM_SUN4I_BACKEND=m
+CONFIG_DRM_SUN6I_DSI=m
 CONFIG_DRM_SUN8I_DW_HDMI=m
 CONFIG_DRM_SUN8I_MIXER=m
 CONFIG_DRM_OMAP=m
@@ -5480,7 +5533,7 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
+CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
@@ -5493,6 +5546,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_ANX78XX=m
+# CONFIG_DRM_CDNS_DSI is not set
 CONFIG_DRM_DUMB_VGA_DAC=m
 # CONFIG_DRM_LVDS_ENCODER is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -5500,7 +5554,8 @@ CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_SIL_SII8620=m
 CONFIG_DRM_SII902X=m
-# CONFIG_DRM_SII9234 is not set
+CONFIG_DRM_SII9234=m
+# CONFIG_DRM_THINE_THC63LVD1024 is not set
 CONFIG_DRM_TOSHIBA_TC358767=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_ANALOGIX_DP=m
@@ -5518,11 +5573,11 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
 CONFIG_DRM_IMX_LDB=m
 CONFIG_DRM_IMX_HDMI=m
+# CONFIG_DRM_V3D is not set
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
-# 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
@@ -5613,7 +5668,6 @@ CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_MX3=y
 # CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
 # CONFIG_FB_MXS is not set
 CONFIG_FB_SIMPLE=y
 CONFIG_FB_SSD1307=y
@@ -5633,6 +5687,7 @@ CONFIG_LCD_PLATFORM=y
 # CONFIG_LCD_AMS369FG06 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_HX8357 is not set
+# CONFIG_LCD_OTM3225A is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PWM=y
@@ -5847,6 +5902,7 @@ CONFIG_SND_SOC_IMX_MC13783=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
 # CONFIG_SND_I2S_HI6210_I2S is not set
 CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_SDMA_SOC=m
 CONFIG_SND_OMAP_SOC_DMIC=m
 CONFIG_SND_OMAP_SOC_MCBSP=m
 CONFIG_SND_OMAP_SOC_MCPDM=m
@@ -5984,6 +6040,7 @@ CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SGTL5000=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
+# CONFIG_SND_SOC_SSM2305 is not set
 # CONFIG_SND_SOC_SSM2602_SPI is not set
 # CONFIG_SND_SOC_SSM2602_I2C is not set
 # CONFIG_SND_SOC_SSM4567 is not set
@@ -6006,6 +6063,7 @@ CONFIG_SND_SOC_TLV320AIC31XX=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_TSCS42XX is not set
+# CONFIG_SND_SOC_TSCS454 is not set
 CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
 # CONFIG_SND_SOC_WM8510 is not set
@@ -6021,6 +6079,7 @@ CONFIG_SND_SOC_WM8731=m
 CONFIG_SND_SOC_WM8753=m
 # CONFIG_SND_SOC_WM8770 is not set
 # CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8782 is not set
 # CONFIG_SND_SOC_WM8804_I2C is not set
 # CONFIG_SND_SOC_WM8804_SPI is not set
 CONFIG_SND_SOC_WM8903=m
@@ -6034,6 +6093,7 @@ CONFIG_SND_SOC_WM9712=m
 # CONFIG_SND_SOC_ZX_AUD96P22 is not set
 # CONFIG_SND_SOC_MAX9759 is not set
 CONFIG_SND_SOC_MC13783=m
+# CONFIG_SND_SOC_MT6351 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8824 is not set
@@ -6109,6 +6169,7 @@ CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MAYFLASH=m
+CONFIG_HID_REDRAGON=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
@@ -6134,6 +6195,7 @@ CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
 CONFIG_SONY_FF=y
 CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
 CONFIG_HID_STEELSERIES=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_RMI=m
@@ -6442,6 +6504,7 @@ CONFIG_TWL6030_USB=m
 CONFIG_USB_GPIO_VBUS=y
 CONFIG_USB_ISP1301=y
 CONFIG_USB_MXS_PHY=y
+CONFIG_USB_TEGRA_PHY=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_GADGET=y
@@ -6594,6 +6657,7 @@ CONFIG_MMC_CB710=m
 CONFIG_MMC_VIA_SDMMC=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_PLTFM=y
+# CONFIG_MMC_DW_BLUEFIELD is not set
 CONFIG_MMC_DW_EXYNOS=y
 # CONFIG_MMC_DW_HI3798CV200 is not set
 CONFIG_MMC_DW_K3=y
@@ -6635,11 +6699,13 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 #
 # CONFIG_LEDS_AAT1290 is not set
 # CONFIG_LEDS_AS3645A is not set
-CONFIG_LEDS_BCM6328=m
-CONFIG_LEDS_BCM6358=m
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+# CONFIG_LEDS_CR0014114 is not set
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3642=m
 # CONFIG_LEDS_LM3692X is not set
+# CONFIG_LEDS_LM3601X is not set
 CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA9532_GPIO=y
 CONFIG_LEDS_GPIO=y
@@ -6902,7 +6968,6 @@ CONFIG_DMA_OF=y
 CONFIG_AMBA_PL08X=y
 CONFIG_AXI_DMAC=y
 CONFIG_DMA_BCM2835=y
-CONFIG_DMA_OMAP=y
 CONFIG_DMA_SUN4I=y
 CONFIG_DMA_SUN6I=y
 # CONFIG_DW_AXI_DMAC is not set
@@ -6917,9 +6982,6 @@ CONFIG_MX3_IPU_IRQS=4
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_PL330_DMA=y
 CONFIG_TEGRA20_APB_DMA=y
-CONFIG_TI_CPPI41=y
-CONFIG_TI_DMA_CROSSBAR=y
-CONFIG_TI_EDMA=y
 CONFIG_XILINX_DMA=y
 CONFIG_XILINX_ZYNQMP_DMA=y
 # CONFIG_QCOM_HIDMA_MGMT is not set
@@ -6927,6 +6989,10 @@ CONFIG_XILINX_ZYNQMP_DMA=y
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 # CONFIG_DW_DMAC_PCI is not set
+CONFIG_TI_CPPI41=y
+CONFIG_TI_EDMA=y
+CONFIG_DMA_OMAP=y
+CONFIG_TI_DMA_CROSSBAR=y
 
 #
 # DMA Clients
@@ -6941,7 +7007,6 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_AUXDISPLAY is not set
-CONFIG_ARM_CHARLCD=y
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV_GENIRQ=m
@@ -6967,8 +7032,6 @@ CONFIG_VIRTIO_MMIO=m
 # Microsoft Hyper-V guest support
 #
 CONFIG_STAGING=y
-# CONFIG_IPX is not set
-# CONFIG_NCP_FS is not set
 CONFIG_PRISM2_USB=m
 # CONFIG_COMEDI is not set
 CONFIG_RTL8192U=m
@@ -6993,9 +7056,7 @@ CONFIG_88EU_AP_MODE=y
 #
 # Accelerometers
 #
-CONFIG_ADIS16201=m
 CONFIG_ADIS16203=m
-CONFIG_ADIS16209=m
 CONFIG_ADIS16240=m
 
 #
@@ -7039,18 +7100,9 @@ CONFIG_ADIS16060=m
 #
 CONFIG_AD5933=m
 
-#
-# Light sensors
-#
-CONFIG_TSL2x7x=m
-
 #
 # Active energy metering IC
 #
-CONFIG_ADE7753=m
-CONFIG_ADE7754=m
-CONFIG_ADE7758=m
-CONFIG_ADE7759=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
@@ -7059,7 +7111,6 @@ CONFIG_ADE7854_SPI=m
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
-CONFIG_AD2S1200=m
 CONFIG_AD2S1210=m
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_XGI is not set
@@ -7092,13 +7143,6 @@ CONFIG_TEGRA_VDE=m
 # CONFIG_STAGING_BOARD is not set
 CONFIG_LTE_GDM724X=m
 # CONFIG_MTD_SPINAND_MT29F is not set
-CONFIG_LNET=m
-CONFIG_LNET_MAX_PAYLOAD=1048576
-CONFIG_LNET_SELFTEST=m
-CONFIG_LNET_XPRT_IB=m
-CONFIG_LUSTRE_FS=m
-# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
-CONFIG_LUSTRE_TRANSLATE_ERRNOS=y
 # CONFIG_DGNC is not set
 CONFIG_GS_FPGABOOT=m
 # CONFIG_UNISYSSPAR is not set
@@ -7392,7 +7436,6 @@ CONFIG_OMAP_GPMC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
 CONFIG_TI_EMIF_SRAM=y
 CONFIG_MVEBU_DEVBUS=y
-CONFIG_TEGRA20_MC=y
 CONFIG_SAMSUNG_MC=y
 CONFIG_EXYNOS_SROM=y
 CONFIG_TEGRA_MC=y
@@ -7413,6 +7456,8 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 #
 # Accelerometers
 #
+CONFIG_ADIS16201=m
+CONFIG_ADIS16209=m
 CONFIG_BMA180=m
 CONFIG_BMA220=m
 CONFIG_BMC150_ACCEL=m
@@ -7504,6 +7549,11 @@ CONFIG_TWL6030_GPADC=m
 CONFIG_VF610_ADC=m
 CONFIG_XILINX_XADC=m
 
+#
+# Analog Front Ends
+#
+CONFIG_IIO_RESCALE=m
+
 #
 # Amplifiers
 #
@@ -7555,6 +7605,8 @@ CONFIG_AD5504=m
 CONFIG_AD5624R_SPI=m
 CONFIG_LTC2632=m
 CONFIG_AD5686=m
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
 CONFIG_AD5755=m
 CONFIG_AD5761=m
 CONFIG_AD5764=m
@@ -7569,6 +7621,7 @@ CONFIG_MAX5821=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
 CONFIG_TI_DAC082S085=m
+CONFIG_TI_DAC5571=m
 CONFIG_VF610_DAC=m
 
 #
@@ -7690,6 +7743,7 @@ CONFIG_TCS3414=m
 CONFIG_TCS3472=m
 CONFIG_SENSORS_TSL2563=m
 CONFIG_TSL2583=m
+CONFIG_TSL2772=m
 CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
@@ -7793,6 +7847,11 @@ CONFIG_SRF04=m
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S1200=m
+
 #
 # Temperature sensors
 #
@@ -7938,6 +7997,7 @@ CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ICE40_SPI=m
+# CONFIG_FPGA_MGR_MACHXO2_SPI is not set
 CONFIG_FPGA_BRIDGE=m
 CONFIG_SOCFPGA_FPGA_BRIDGE=m
 CONFIG_ALTERA_FREEZE_BRIDGE=m
@@ -8047,6 +8107,7 @@ CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
 CONFIG_QUOTACTL=y
 CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=y
@@ -8074,7 +8135,6 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
 
 #
 # DOS/FAT/NT Filesystems
@@ -8099,6 +8159,7 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
+CONFIG_MEMFD_CREATE=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
@@ -8343,6 +8404,9 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set
 
 #
@@ -8536,6 +8600,11 @@ CONFIG_CRYPTO_ENGINE=m
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128L=m
+CONFIG_CRYPTO_AEGIS256=m
+CONFIG_CRYPTO_MORUS640=m
+CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=m
 
@@ -8617,6 +8686,7 @@ CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
+# CONFIG_CRYPTO_ZSTD is not set
 
 #
 # Random Number Generation
@@ -8759,6 +8829,8 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y
 CONFIG_SGL_ALLOC=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y