kernels: linux-libre-x86_64: update to 5.2.2 by syncing with linux-libre

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

16 files changed, 1063 insertions, 733 deletions

diff --git a/kernels/linux-libre-x86_64/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/kernels/linux-libre-x86_64/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
deleted file mode 100644
index d53a28a8f..000000000
--- a/kernels/linux-libre-x86_64/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From aec38a2b1453395a62290dda38a5a33706d4d13d Mon Sep 17 00:00:00 2001
-From: Willy Tarreau <w@xxxxxx>
-Date: Sun, 2 Dec 2012 19:59:28 +0100
-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.
-
-Signed-off-by: Willy Tarreau <w@xxxxxx>
----
- arch/arm/include/uapi/asm/setup.h | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h
-index 6b335a9ff8c8..614150b53643 100644
---- a/arch/arm/include/uapi/asm/setup.h
-+++ b/arch/arm/include/uapi/asm/setup.h
-@@ -144,6 +144,18 @@ struct tag_memclk {
- 	__u32 fmemclk;
- };
- 
-+/* Marvell uboot parameters */
-+#define ATAG_MV_UBOOT          0x41000403
-+struct tag_mv_uboot {
-+	__u32 uboot_version;
-+	__u32 tclk;
-+	__u32 sysclk;
-+	__u32 isUsbHost;
-+	__u8  macAddr[4][6];
-+	__u16 mtu[4];
-+	__u32 nand_ecc;
-+};
-+
- struct tag {
- 	struct tag_header hdr;
- 	union {
-@@ -166,6 +178,11 @@ struct tag {
- 		 * DC21285 specific
- 		 */
- 		struct tag_memclk	memclk;
-+
-+		/*
-+		 * Marvell specific
-+		 */
-+		struct tag_mv_uboot	mv_uboot;
- 	} u;
- };
- 
--- 
-2.19.2
-
diff --git a/kernels/linux-libre-x86_64/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/kernels/linux-libre-x86_64/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index fced98119..a972caccb 100644
--- a/kernels/linux-libre-x86_64/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/kernels/linux-libre-x86_64/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,7 +1,8 @@
-From 4272e4eff36395bf7e89550111219bede31013e2 Mon Sep 17 00:00:00 2001
+From 07a714ed114cb6beb90f3ef5dbc56d8cfee3a864 Mon Sep 17 00:00:00 2001
 From: Serge Hallyn <serge.hallyn@canonical.com>
 Date: Fri, 31 May 2013 19:12:12 +0100
-Subject: [PATCH] add sysctl to disallow unprivileged CLONE_NEWUSER by default
+Subject: [PATCH 1/5] add sysctl to disallow unprivileged CLONE_NEWUSER by
+ default
 
 Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
 [bwh: Remove unneeded binary sysctl bits]
@@ -13,10 +14,10 @@ Signed-off-by: Daniel Micay <danielmicay@gmail.com>
  3 files changed, 30 insertions(+)
 
 diff --git a/kernel/fork.c b/kernel/fork.c
-index b69248e6f0e0..3b1cd11dc6dc 100644
+index fe83343da24b..1047576e45ef 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -104,6 +104,11 @@
+@@ -106,6 +106,11 @@
  
  #define CREATE_TRACE_POINTS
  #include <trace/events/task.h>
@@ -28,7 +29,7 @@ index b69248e6f0e0..3b1cd11dc6dc 100644
  
  /*
   * Minimum number of threads to boot the kernel
-@@ -1695,6 +1700,10 @@ static __latent_entropy struct task_struct *copy_process(
+@@ -1765,6 +1770,10 @@ static __latent_entropy struct task_struct *copy_process(
  	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
  		return ERR_PTR(-EINVAL);
  
@@ -39,7 +40,7 @@ index b69248e6f0e0..3b1cd11dc6dc 100644
  	/*
  	 * Thread groups must share signals as well, and detached threads
  	 * can only be started up within the thread group.
-@@ -2528,6 +2537,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -2653,6 +2662,12 @@ int ksys_unshare(unsigned long unshare_flags)
  	if (unshare_flags & CLONE_NEWNS)
  		unshare_flags |= CLONE_FS;
  
@@ -53,10 +54,10 @@ index b69248e6f0e0..3b1cd11dc6dc 100644
  	if (err)
  		goto bad_unshare_out;
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index d80bee8ff12e..ce7a1a5794a5 100644
+index 1beca96fb625..fb9633b8b385 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -106,6 +106,9 @@ extern int core_uses_pid;
+@@ -110,6 +110,9 @@ extern int core_uses_pid;
  extern char core_pattern[];
  extern unsigned int core_pipe_limit;
  #endif
@@ -66,7 +67,7 @@ index d80bee8ff12e..ce7a1a5794a5 100644
  extern int pid_max;
  extern int pid_max_min, pid_max_max;
  extern int percpu_pagelist_fraction;
-@@ -515,6 +518,15 @@ static struct ctl_table kern_table[] = {
+@@ -532,6 +535,15 @@ static struct ctl_table kern_table[] = {
  		.proc_handler	= proc_dointvec,
  	},
  #endif
@@ -83,10 +84,10 @@ index d80bee8ff12e..ce7a1a5794a5 100644
  	{
  		.procname	= "tainted",
 diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 923414a246e9..6b9dbc257e34 100644
+index 0eff45ce7703..b2f8b5777670 100644
 --- a/kernel/user_namespace.c
 +++ b/kernel/user_namespace.c
-@@ -26,6 +26,9 @@
+@@ -21,6 +21,9 @@
  #include <linux/bsearch.h>
  #include <linux/sort.h>
  
@@ -97,5 +98,5 @@ index 923414a246e9..6b9dbc257e34 100644
  static DEFINE_MUTEX(userns_state_mutex);
  
 -- 
-2.21.0
+2.22.0
 
diff --git a/kernels/linux-libre-x86_64/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/kernels/linux-libre-x86_64/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
deleted file mode 100644
index 2f149dafb..000000000
--- a/kernels/linux-libre-x86_64/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 500fa72f9dd68904807d9effd7011586e153ba6c Mon Sep 17 00:00:00 2001
-From: Willy Tarreau <w@xxxxxx>
-Date: Sun, 2 Dec 2012 19:56:58 +0100
-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
-addresses are extracted there and assigned to node aliases eth0..3
-with the name "mac-address".
-
-This was tested on my Mirabox and the two NICs had their correct
-address set.
-
-Signed-off-by: Willy Tarreau <w@xxxxxx>
----
- arch/arm/boot/compressed/atags_to_fdt.c | 8 +++++++-
- 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 330cd3c2eae5..82f3802ff695 100644
---- a/arch/arm/boot/compressed/atags_to_fdt.c
-+++ b/arch/arm/boot/compressed/atags_to_fdt.c
-@@ -19,7 +19,7 @@ static int node_offset(void *fdt, const char *node_path)
- }
- 
- static int setprop(void *fdt, const char *node_path, const char *property,
--		   uint32_t *val_array, int size)
-+		   void *val_array, int size)
- {
- 	int offset = node_offset(fdt, node_path);
- 	if (offset < 0)
-@@ -203,6 +203,12 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space)
- 			hex_str(serno, atag->u.serialnr.high);
- 			hex_str(serno+8, atag->u.serialnr.low);
- 			setprop_string(fdt, "/", "serial-number", serno);
-+		} else if (atag->hdr.tag == ATAG_MV_UBOOT) {
-+			/* This ATAG provides up to 4 MAC addresses */
-+			setprop(fdt, "eth0", "mac-address", atag->u.mv_uboot.macAddr[0], 6);
-+			setprop(fdt, "eth1", "mac-address", atag->u.mv_uboot.macAddr[1], 6);
-+			setprop(fdt, "eth2", "mac-address", atag->u.mv_uboot.macAddr[2], 6);
-+			setprop(fdt, "eth3", "mac-address", atag->u.mv_uboot.macAddr[3], 6);
- 		}
- 	}
- 
--- 
-2.19.2
-
diff --git a/kernels/linux-libre-x86_64/0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch b/kernels/linux-libre-x86_64/0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
new file mode 100644
index 000000000..f72b49a4e
--- /dev/null
+++ b/kernels/linux-libre-x86_64/0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
@@ -0,0 +1,57 @@
+From 52deaa0f77df6fdd3ae785cfdd21c0bb39247bed Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Thu, 7 Dec 2017 13:50:48 +0100
+Subject: [PATCH 2/5] ZEN: Add CONFIG for unprivileged_userns_clone
+
+This way our default behavior continues to match the vanilla kernel.
+---
+ init/Kconfig            | 16 ++++++++++++++++
+ kernel/user_namespace.c |  4 ++++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/init/Kconfig b/init/Kconfig
+index 0e2344389501..96f76927710a 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1013,6 +1013,22 @@ config USER_NS
+ 
+ 	  If unsure, say N.
+ 
++config USER_NS_UNPRIVILEGED
++	bool "Allow unprivileged users to create namespaces"
++	default y
++	depends on USER_NS
++	help
++	  When disabled, unprivileged users will not be able to create
++	  new namespaces. Allowing users to create their own namespaces
++	  has been part of several recent local privilege escalation
++	  exploits, so if you need user namespaces but are
++	  paranoid^Wsecurity-conscious you want to disable this.
++
++	  This setting can be overridden at runtime via the
++	  kernel.unprivileged_userns_clone sysctl.
++
++	  If unsure, say Y.
++
+ config PID_NS
+ 	bool "PID Namespaces"
+ 	default y
+diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
+index b2f8b5777670..aa27ecacfb1e 100644
+--- a/kernel/user_namespace.c
++++ b/kernel/user_namespace.c
+@@ -22,7 +22,11 @@
+ #include <linux/sort.h>
+ 
+ /* sysctl */
++#ifdef CONFIG_USER_NS_UNPRIVILEGED
++int unprivileged_userns_clone = 1;
++#else
+ int unprivileged_userns_clone;
++#endif
+ 
+ static struct kmem_cache *user_ns_cachep __read_mostly;
+ static DEFINE_MUTEX(userns_state_mutex);
+-- 
+2.22.0
+
diff --git a/kernels/linux-libre-x86_64/0003-SMILE-Plug-device-tree-file.patch b/kernels/linux-libre-x86_64/0003-SMILE-Plug-device-tree-file.patch
deleted file mode 100644
index 4196538bf..000000000
--- a/kernels/linux-libre-x86_64/0003-SMILE-Plug-device-tree-file.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From 25481e75ce7ac18b05d357c95e29f8f959cbe333 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/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.
-
-Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
----
- arch/arm/boot/dts/Makefile                 |   1 +
- 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 bd40148a15b2..97593ea828eb 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -1175,6 +1175,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
- 	armada-370-db.dtb \
- 	armada-370-dlink-dns327l.dtb \
- 	armada-370-mirabox.dtb \
-+	armada-370-smileplug.dtb \
- 	armada-370-netgear-rn102.dtb \
- 	armada-370-netgear-rn104.dtb \
- 	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 000000000000..d01308ab848b
---- /dev/null
-+++ b/arch/arm/boot/dts/armada-370-smileplug.dts
-@@ -0,0 +1,173 @@
-+/*
-+ * Device Tree file for Marvell SMILE Plug
-+ *
-+ * Kevin Mihelich <kevin@archlinuxarm.org>
-+ * Gregory CLEMENT <gregory.clement@free-electrons.com>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+/dts-v1/;
-+#include <dt-bindings/gpio/gpio.h>
-+#include "armada-370.dtsi"
-+
-+/ {
-+	model = "Marvell SMILE Plug";
-+	compatible = "marvell,smileplug", "marvell,armada370", "marvell,armada-370-xp";
-+
-+	chosen {
-+		bootargs = "console=ttyS0,115200 earlyprintk";
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x00000000 0x20000000>; /* 512 MB */
-+	};
-+
-+	soc {
-+		ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
-+			  MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
-+
-+		pcie-controller {
-+			status = "okay";
-+
-+			/* Internal mini-PCIe connector */
-+			pcie@1,0 {
-+				/* Port 0, Lane 0 */
-+				status = "okay";
-+			};
-+
-+			/* Connected on the PCB to a USB 3.0 XHCI controller */
-+			pcie@2,0 {
-+				/* Port 1, Lane 0 */
-+				status = "okay";
-+			};
-+		};
-+
-+		internal-regs {
-+			serial@12000 {
-+				status = "okay";
-+			};
-+			timer@20300 {
-+				clock-frequency = <600000000>;
-+				status = "okay";
-+			};
-+
-+			gpio_leds {
-+				compatible = "gpio-leds";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&smile_led_pins>;
-+
-+				red_eyes_led {
-+					label = "smileplug:red:eyes";
-+					gpios = <&gpio1 31 0>;
-+					default-state = "off";
-+				};
-+
-+				green_eyes_led {
-+					label = "smileplug:green:eyes";
-+					gpios = <&gpio2 0 0>;
-+					linux,default-trigger = "default-on";
-+				};
-+
-+				red_smile_led {
-+					label = "smileplug:red:smile";
-+					gpios = <&gpio1 15 0>;
-+					default-state = "off";
-+				};
-+
-+				green_smile_led {
-+					label = "smileplug:green:smile";
-+					gpios = <&gpio1 27 0>;
-+					linux,default-trigger = "default-on";
-+				};
-+			};
-+
-+			mdio {
-+				pinctrl-0 = <&mdio_pins>;
-+				pinctrl-names = "default";
-+				phy0: ethernet-phy@0 {
-+					reg = <0>;
-+				};
-+
-+				phy1: ethernet-phy@1 {
-+					reg = <1>;
-+				};
-+			};
-+			ethernet@70000 {
-+				pinctrl-0 = <&ge0_rgmii_pins>;
-+				pinctrl-names = "default";
-+				status = "okay";
-+				phy = <&phy0>;
-+				phy-mode = "rgmii-id";
-+			};
-+			ethernet@74000 {
-+				pinctrl-0 = <&ge1_rgmii_pins>;
-+				pinctrl-names = "default";
-+				status = "okay";
-+				phy = <&phy1>;
-+				phy-mode = "rgmii-id";
-+			};
-+
-+			mvsdio@d4000 {
-+				pinctrl-0 = <&sdio_pins3>;
-+				pinctrl-names = "default";
-+				status = "okay";
-+				/*
-+				 * No CD or WP GPIOs: SDIO interface used for
-+				 * Wifi/Bluetooth chip
-+				 */
-+				 broken-cd;
-+			};
-+
-+			usb@50000 {
-+				status = "okay";
-+			};
-+
-+			usb@51000 {
-+				status = "okay";
-+			};
-+
-+			i2c@11000 {
-+				status = "okay";
-+				clock-frequency = <100000>;
-+				pca9505: pca9505@25 {
-+					compatible = "nxp,pca9505";
-+					gpio-controller;
-+					#gpio-cells = <2>;
-+					reg = <0x25>;
-+				};
-+			};
-+
-+			nand@d0000 {
-+				status = "okay";
-+				num-cs = <1>;
-+				marvell,nand-keep-config;
-+				marvell,nand-enable-arbiter;
-+				nand-on-flash-bbt;
-+
-+				partition@0 {
-+					label = "U-Boot";
-+					reg = <0 0x400000>;
-+				};
-+				partition@400000 {
-+					label = "Linux";
-+					reg = <0x400000 0x400000>;
-+				};
-+				partition@800000 {
-+					label = "Filesystem";
-+					reg = <0x800000 0x3f800000>;
-+				};
-+			};
-+		};
-+	};
-+};
-+
-+&pinctrl {
-+	smile_led_pins: smile-led-pins {
-+		marvell,pins = "mpp63", "mpp64", "mpp47", "mpp59";
-+		marvell,function = "gpio";
-+	};
-+};
--- 
-2.19.2
-
diff --git a/kernels/linux-libre-x86_64/0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch b/kernels/linux-libre-x86_64/0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
new file mode 100644
index 000000000..5c1018dc4
--- /dev/null
+++ b/kernels/linux-libre-x86_64/0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
@@ -0,0 +1,53 @@
+From d426d34276c9f17081179be6497cddd74154556a Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Wed, 3 Jul 2019 11:10:49 +0300
+Subject: [PATCH 3/5] iwlwifi: mvm: disable TX-AMSDU on older NICs
+
+On older NICs, we occasionally see issues with A-MSDU support,
+where the commands in the FIFO get confused and then we see an
+assert EDC because the next command in the FIFO isn't TX.
+
+We've tried to isolate this issue and understand where it comes
+from, but haven't found any errors in building the A-MSDU in
+software.
+
+At least for now, disable A-MSDU support on older hardware so
+that users can use it again without fearing the assert.
+
+This fixes https://bugzilla.kernel.org/show_bug.cgi?id=203315.
+
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+Acked-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+index fdbabca0280e..3a076e5e319f 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+@@ -468,7 +468,19 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
+ 	ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW);
+ 	ieee80211_hw_set(hw, BUFF_MMPDU_TXQ);
+ 	ieee80211_hw_set(hw, STA_MMPDU_TXQ);
+-	ieee80211_hw_set(hw, TX_AMSDU);
++	/*
++	 * On older devices, enabling TX A-MSDU occasionally leads to
++	 * something getting messed up, the command read from the FIFO
++	 * gets out of sync and isn't a TX command, so that we have an
++	 * assert EDC.
++	 *
++	 * It's not clear where the bug is, but since we didn't used to
++	 * support A-MSDU until moving the mac80211 iTXQs, just leave it
++	 * for older devices. We also don't see this issue on any newer
++	 * devices.
++	 */
++	if (mvm->cfg->device_family >= IWL_DEVICE_FAMILY_9000)
++		ieee80211_hw_set(hw, TX_AMSDU);
+ 	ieee80211_hw_set(hw, TX_FRAG_LIST);
+ 
+ 	if (iwl_mvm_has_tlc_offload(mvm)) {
+-- 
+2.22.0
+
diff --git a/kernels/linux-libre-x86_64/0004-fix-mvsdio-eMMC-timing.patch b/kernels/linux-libre-x86_64/0004-fix-mvsdio-eMMC-timing.patch
deleted file mode 100644
index bdba72e3c..000000000
--- a/kernels/linux-libre-x86_64/0004-fix-mvsdio-eMMC-timing.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From faed79b3f326e7111770a260dc9790f36e36a152 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/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.
-
-Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
----
- drivers/mmc/host/mvsdio.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-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)
- 	tmout_index = fls(tmout - 1) - 12;
- 	if (tmout_index < 0)
- 		tmout_index = 0;
--	if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX)
-+//	if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX)	//by steven, try to setup the timeout to maximum value
- 		tmout_index = MVSD_HOST_CTRL_TMOUT_MAX;
- 
- 	dev_dbg(host->dev, "data %s at 0x%08x: blocks=%d blksz=%d tmout=%u (%d)\n",
-@@ -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;
-+		if(ios->clock==50000000 )	//by steven
-+			m=1;
- 		mvsd_write(MVSD_CLK_DIV, m);
- 		host->clock = ios->clock;
- 		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
--- 
-2.19.2
-
diff --git a/kernels/linux-libre-x86_64/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch b/kernels/linux-libre-x86_64/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
new file mode 100644
index 000000000..bc9f20bf7
--- /dev/null
+++ b/kernels/linux-libre-x86_64/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
@@ -0,0 +1,328 @@
+From 8dcd32438c96b8099b6447712148a4e4a06c78a7 Mon Sep 17 00:00:00 2001
+From: Haim Dreyfuss <haim.dreyfuss@intel.com>
+Date: Wed, 27 Feb 2019 16:43:45 +0200
+Subject: [PATCH 4/5] iwlwifi: Add support for SAR South Korea limitation
+
+South Korea is adding a more strict SAR limit called "Limb SAR".
+Currently, WGDS SAR offset group 3 is not used (not mapped to any country).
+In order to be able to comply with South Korea new restriction:
+- OEM will use WGDS SAR offset group 3 to South Korea limitation.
+- OEM will change WGDS revision to 1 (currently latest revision is 0)
+	to notify that Korea Limb SAR applied.
+- Driver will read the WGDS table and pass the values to FW (as usual)
+- Driver will pass to FW an indication that Korea Limb SAR is applied
+	in case table revision is 1.
+
+Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+---
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.c  | 28 ++++++----
+ drivers/net/wireless/intel/iwlwifi/fw/acpi.h  |  5 +-
+ .../net/wireless/intel/iwlwifi/fw/api/power.h | 12 ++++
+ drivers/net/wireless/intel/iwlwifi/fw/file.h  |  3 +
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c   | 55 ++++++++++++++-----
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h  |  1 +
+ 6 files changed, 76 insertions(+), 28 deletions(-)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
+index 405038ce98d6..7573af2d88ce 100644
+--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
++++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
+@@ -97,7 +97,7 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_object);
+ 
+ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
+ 					 union acpi_object *data,
+-					 int data_size)
++					 int data_size, int *tbl_rev)
+ {
+ 	int i;
+ 	union acpi_object *wifi_pkg;
+@@ -113,16 +113,19 @@ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
+ 	/*
+ 	 * We need at least two packages, one for the revision and one
+ 	 * for the data itself.  Also check that the revision is valid
+-	 * (i.e. it is an integer set to 0).
++	 * (i.e. it is an integer smaller than 2, as we currently support only
++	 * 2 revisions).
+ 	 */
+ 	if (data->type != ACPI_TYPE_PACKAGE ||
+ 	    data->package.count < 2 ||
+ 	    data->package.elements[0].type != ACPI_TYPE_INTEGER ||
+-	    data->package.elements[0].integer.value != 0) {
++	    data->package.elements[0].integer.value > 1) {
+ 		IWL_DEBUG_DEV_RADIO(dev, "Unsupported packages structure\n");
+ 		return ERR_PTR(-EINVAL);
+ 	}
+ 
++	*tbl_rev = data->package.elements[0].integer.value;
++
+ 	/* loop through all the packages to find the one for WiFi */
+ 	for (i = 1; i < data->package.count; i++) {
+ 		union acpi_object *domain;
+@@ -151,14 +154,15 @@ int iwl_acpi_get_mcc(struct device *dev, char *mcc)
+ {
+ 	union acpi_object *wifi_pkg, *data;
+ 	u32 mcc_val;
+-	int ret;
++	int ret, tbl_rev;
+ 
+ 	data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD);
+ 	if (IS_ERR(data))
+ 		return PTR_ERR(data);
+ 
+-	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE);
+-	if (IS_ERR(wifi_pkg)) {
++	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE,
++					 &tbl_rev);
++	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
+ 		ret = PTR_ERR(wifi_pkg);
+ 		goto out_free;
+ 	}
+@@ -185,6 +189,7 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev)
+ {
+ 	union acpi_object *data, *wifi_pkg;
+ 	u64 dflt_pwr_limit;
++	int tbl_rev;
+ 
+ 	data = iwl_acpi_get_object(dev, ACPI_SPLC_METHOD);
+ 	if (IS_ERR(data)) {
+@@ -193,8 +198,8 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev)
+ 	}
+ 
+ 	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data,
+-					 ACPI_SPLC_WIFI_DATA_SIZE);
+-	if (IS_ERR(wifi_pkg) ||
++					 ACPI_SPLC_WIFI_DATA_SIZE, &tbl_rev);
++	if (IS_ERR(wifi_pkg) || tbl_rev != 0 ||
+ 	    wifi_pkg->package.elements[1].integer.value != ACPI_TYPE_INTEGER) {
+ 		dflt_pwr_limit = 0;
+ 		goto out_free;
+@@ -211,14 +216,15 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_pwr_limit);
+ int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)
+ {
+ 	union acpi_object *wifi_pkg, *data;
+-	int ret;
++	int ret, tbl_rev;
+ 
+ 	data = iwl_acpi_get_object(dev, ACPI_ECKV_METHOD);
+ 	if (IS_ERR(data))
+ 		return PTR_ERR(data);
+ 
+-	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE);
+-	if (IS_ERR(wifi_pkg)) {
++	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE,
++					 &tbl_rev);
++	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
+ 		ret = PTR_ERR(wifi_pkg);
+ 		goto out_free;
+ 	}
+diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
+index f5704e16643f..991a23450999 100644
+--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
++++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
+@@ -97,7 +97,7 @@
+ void *iwl_acpi_get_object(struct device *dev, acpi_string method);
+ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
+ 					 union acpi_object *data,
+-					 int data_size);
++					 int data_size, int *tbl_rev);
+ 
+ /**
+  * iwl_acpi_get_mcc - read MCC from ACPI, if available
+@@ -131,7 +131,8 @@ static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)
+ 
+ static inline union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
+ 						       union acpi_object *data,
+-						       int data_size)
++						       int data_size,
++						       int *tbl_rev)
+ {
+ 	return ERR_PTR(-ENOENT);
+ }
+diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
+index 01f003c6cff9..f195db398bed 100644
+--- a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
++++ b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
+@@ -419,14 +419,26 @@ struct iwl_per_chain_offset_group {
+ 	struct iwl_per_chain_offset hb;
+ } __packed; /* PER_CHAIN_LIMIT_OFFSET_GROUP_S_VER_1 */
+ 
++/**
++ * struct iwl_geo_tx_power_profile_cmd_v1 - struct for GEO_TX_POWER_LIMIT cmd.
++ * @ops: operations, value from &enum iwl_geo_per_chain_offset_operation
++ * @table: offset profile per band.
++ */
++struct iwl_geo_tx_power_profiles_cmd_v1 {
++	__le32 ops;
++	struct iwl_per_chain_offset_group table[IWL_NUM_GEO_PROFILES];
++} __packed; /* GEO_TX_POWER_LIMIT_VER_1 */
++
+ /**
+  * struct iwl_geo_tx_power_profile_cmd - struct for GEO_TX_POWER_LIMIT cmd.
+  * @ops: operations, value from &enum iwl_geo_per_chain_offset_operation
+  * @table: offset profile per band.
++ * @table_revision: BIOS table revision.
+  */
+ struct iwl_geo_tx_power_profiles_cmd {
+ 	__le32 ops;
+ 	struct iwl_per_chain_offset_group table[IWL_NUM_GEO_PROFILES];
++	__le32 table_revision;
+ } __packed; /* GEO_TX_POWER_LIMIT */
+ 
+ /**
+diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h
+index de9243d30135..a74f34a8dffb 100644
+--- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
++++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
+@@ -286,6 +286,8 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t;
+  *	SCAN_OFFLOAD_PROFILES_QUERY_RSP_S.
+  * @IWL_UCODE_TLV_API_MBSSID_HE: This ucode supports v2 of
+  *	STA_CONTEXT_DOT11AX_API_S
++ * @IWL_UCODE_TLV_CAPA_SAR_TABLE_VER: This ucode supports different sar
++ *	version tables.
+  *
+  * @NUM_IWL_UCODE_TLV_API: number of bits used
+  */
+@@ -318,6 +320,7 @@ enum iwl_ucode_tlv_api {
+ 	IWL_UCODE_TLV_API_MBSSID_HE		= (__force iwl_ucode_tlv_api_t)52,
+ 	IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE	= (__force iwl_ucode_tlv_api_t)53,
+ 	IWL_UCODE_TLV_API_FTM_RTT_ACCURACY      = (__force iwl_ucode_tlv_api_t)54,
++	IWL_UCODE_TLV_API_SAR_TABLE_VER         = (__force iwl_ucode_tlv_api_t)55,
+ 
+ 	NUM_IWL_UCODE_TLV_API
+ #ifdef __CHECKER__
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+index 153717587aeb..36c260f8ed00 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+@@ -681,15 +681,15 @@ static int iwl_mvm_sar_get_wrds_table(struct iwl_mvm *mvm)
+ {
+ 	union acpi_object *wifi_pkg, *table, *data;
+ 	bool enabled;
+-	int ret;
++	int ret, tbl_rev;
+ 
+ 	data = iwl_acpi_get_object(mvm->dev, ACPI_WRDS_METHOD);
+ 	if (IS_ERR(data))
+ 		return PTR_ERR(data);
+ 
+ 	wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
+-					 ACPI_WRDS_WIFI_DATA_SIZE);
+-	if (IS_ERR(wifi_pkg)) {
++					 ACPI_WRDS_WIFI_DATA_SIZE, &tbl_rev);
++	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
+ 		ret = PTR_ERR(wifi_pkg);
+ 		goto out_free;
+ 	}
+@@ -718,15 +718,15 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm)
+ {
+ 	union acpi_object *wifi_pkg, *data;
+ 	bool enabled;
+-	int i, n_profiles, ret;
++	int i, n_profiles, ret, tbl_rev;
+ 
+ 	data = iwl_acpi_get_object(mvm->dev, ACPI_EWRD_METHOD);
+ 	if (IS_ERR(data))
+ 		return PTR_ERR(data);
+ 
+ 	wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
+-					 ACPI_EWRD_WIFI_DATA_SIZE);
+-	if (IS_ERR(wifi_pkg)) {
++					 ACPI_EWRD_WIFI_DATA_SIZE, &tbl_rev);
++	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {
+ 		ret = PTR_ERR(wifi_pkg);
+ 		goto out_free;
+ 	}
+@@ -777,7 +777,7 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm)
+ static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm)
+ {
+ 	union acpi_object *wifi_pkg, *data;
+-	int i, j, ret;
++	int i, j, ret, tbl_rev;
+ 	int idx = 1;
+ 
+ 	data = iwl_acpi_get_object(mvm->dev, ACPI_WGDS_METHOD);
+@@ -785,12 +785,13 @@ static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm)
+ 		return PTR_ERR(data);
+ 
+ 	wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
+-					 ACPI_WGDS_WIFI_DATA_SIZE);
+-	if (IS_ERR(wifi_pkg)) {
++					 ACPI_WGDS_WIFI_DATA_SIZE, &tbl_rev);
++	if (IS_ERR(wifi_pkg) || tbl_rev > 1) {
+ 		ret = PTR_ERR(wifi_pkg);
+ 		goto out_free;
+ 	}
+ 
++	mvm->geo_rev = tbl_rev;
+ 	for (i = 0; i < ACPI_NUM_GEO_PROFILES; i++) {
+ 		for (j = 0; j < ACPI_GEO_TABLE_SIZE; j++) {
+ 			union acpi_object *entry;
+@@ -877,15 +878,29 @@ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)
+ {
+ 	struct iwl_geo_tx_power_profiles_resp *resp;
+ 	int ret;
++	u16 len;
++	void *data;
++	struct iwl_geo_tx_power_profiles_cmd geo_cmd;
++	struct iwl_geo_tx_power_profiles_cmd_v1 geo_cmd_v1;
++	struct iwl_host_cmd cmd;
++
++	if (fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_SAR_TABLE_VER)) {
++		geo_cmd.ops =
++			cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE);
++		len = sizeof(geo_cmd);
++		data = &geo_cmd;
++	} else {
++		geo_cmd_v1.ops =
++			cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE);
++		len = sizeof(geo_cmd_v1);
++		data = &geo_cmd_v1;
++	}
+ 
+-	struct iwl_geo_tx_power_profiles_cmd geo_cmd = {
+-		.ops = cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE),
+-	};
+-	struct iwl_host_cmd cmd = {
++	cmd = (struct iwl_host_cmd){
+ 		.id =  WIDE_ID(PHY_OPS_GROUP, GEO_TX_POWER_LIMIT),
+-		.len = { sizeof(geo_cmd), },
++		.len = { len, },
+ 		.flags = CMD_WANT_SKB,
+-		.data = { &geo_cmd },
++		.data = { data },
+ 	};
+ 
+ 	ret = iwl_mvm_send_cmd(mvm, &cmd);
+@@ -955,6 +970,16 @@ static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm)
+ 					i, j, value[1], value[2], value[0]);
+ 		}
+ 	}
++
++	cmd.table_revision = cpu_to_le32(mvm->geo_rev);
++
++	if (!fw_has_api(&mvm->fw->ucode_capa,
++		       IWL_UCODE_TLV_API_SAR_TABLE_VER)) {
++		return iwl_mvm_send_cmd_pdu(mvm, cmd_wide_id, 0,
++				sizeof(struct iwl_geo_tx_power_profiles_cmd_v1),
++				&cmd);
++	}
++
+ 	return iwl_mvm_send_cmd_pdu(mvm, cmd_wide_id, 0, sizeof(cmd), &cmd);
+ }
+ 
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+index 02efcf2189c4..5c34e405173b 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+@@ -1181,6 +1181,7 @@ struct iwl_mvm {
+ #ifdef CONFIG_ACPI
+ 	struct iwl_mvm_sar_profile sar_profiles[ACPI_SAR_PROFILE_NUM];
+ 	struct iwl_mvm_geo_profile geo_profiles[ACPI_NUM_GEO_PROFILES];
++	u32 geo_rev;
+ #endif
+ };
+ 
+-- 
+2.22.0
+
diff --git a/kernels/linux-libre-x86_64/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-x86_64/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
deleted file mode 100644
index 189793152..000000000
--- a/kernels/linux-libre-x86_64/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From fe27576a0c9c3e49af29b32695dbf820c5664cb3 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Tue, 18 Feb 2014 01:43:50 -0300
-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 e3d08626828e..2eaae00b4033 100644
---- a/drivers/net/usb/smsc95xx.c
-+++ b/drivers/net/usb/smsc95xx.c
-@@ -60,6 +60,7 @@
- #define SUSPEND_SUSPEND3		(0x08)
- #define SUSPEND_ALLMODES		(SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
- 					 SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
-+#define MAC_ADDR_LEN                    (6)
- 
- #define CARRIER_CHECK_DELAY (2 * HZ)
- 
-@@ -82,6 +83,10 @@ static bool turbo_mode = true;
- module_param(turbo_mode, bool, 0644);
- MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
- 
-+static char *macaddr = ":";
-+module_param(macaddr, charp, 0);
-+MODULE_PARM_DESC(macaddr, "MAC address");
-+
- static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
- 					    u32 *data, int in_pm)
- {
-@@ -911,8 +916,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
- 	return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
- }
- 
-+/* Check the macaddr module parameter for a MAC address */
-+static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac)
-+{
-+       int i, j, got_num, num;
-+       u8 mtbl[MAC_ADDR_LEN];
-+
-+       if (macaddr[0] == ':')
-+               return 0;
-+
-+       i = 0;
-+       j = 0;
-+       num = 0;
-+       got_num = 0;
-+       while (j < MAC_ADDR_LEN) {
-+               if (macaddr[i] && macaddr[i] != ':') {
-+                       got_num++;
-+                       if ('0' <= macaddr[i] && macaddr[i] <= '9')
-+                               num = num * 16 + macaddr[i] - '0';
-+                       else if ('A' <= macaddr[i] && macaddr[i] <= 'F')
-+                               num = num * 16 + 10 + macaddr[i] - 'A';
-+                       else if ('a' <= macaddr[i] && macaddr[i] <= 'f')
-+                               num = num * 16 + 10 + macaddr[i] - 'a';
-+                       else
-+                               break;
-+                       i++;
-+               } else if (got_num == 2) {
-+                       mtbl[j++] = (u8) num;
-+                       num = 0;
-+                       got_num = 0;
-+                       i++;
-+               } else {
-+                       break;
-+               }
-+       }
-+
-+       if (j == MAC_ADDR_LEN) {
-+               netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: "
-+               "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2],
-+                                               mtbl[3], mtbl[4], mtbl[5]);
-+               for (i = 0; i < MAC_ADDR_LEN; i++)
-+                       dev_mac[i] = mtbl[i];
-+               return 1;
-+       } else {
-+               return 0;
-+       }
-+}
-+
- static void smsc95xx_init_mac_address(struct usbnet *dev)
- {
-+       /* Check module parameters */
-+       if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr))
-+               return;
-+
- 	const u8 *mac_addr;
- 
- 	/* maybe the boot loader passed the MAC address in devicetree */
--- 
-2.19.2
-
diff --git a/kernels/linux-libre-x86_64/0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch b/kernels/linux-libre-x86_64/0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch
new file mode 100644
index 000000000..806fd6f32
--- /dev/null
+++ b/kernels/linux-libre-x86_64/0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch
@@ -0,0 +1,27 @@
+From 164647d76a17d87a33440e6149b616eeed34970f Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Thu, 11 Jul 2019 01:31:12 +0200
+Subject: [PATCH 5/5] netfilter: nf_tables: fix module autoload for redir
+
+Fix expression for autoloading.
+
+Fixes: 5142967ab524 ("netfilter: nf_tables: fix module autoload with inet family")
+Signed-off-by: Christian Hesse <mail@eworm.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ net/netfilter/nft_redir.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/netfilter/nft_redir.c b/net/netfilter/nft_redir.c
+index 8487eeff5c0e..43eeb1f609f1 100644
+--- a/net/netfilter/nft_redir.c
++++ b/net/netfilter/nft_redir.c
+@@ -291,4 +291,4 @@ module_exit(nft_redir_module_exit);
+ 
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Arturo Borrero Gonzalez <arturo@debian.org>");
+-MODULE_ALIAS_NFT_EXPR("nat");
++MODULE_ALIAS_NFT_EXPR("redir");
+-- 
+2.22.0
+
diff --git a/kernels/linux-libre-x86_64/0006-set-default-cubietruck-led-triggers.patch b/kernels/linux-libre-x86_64/0006-set-default-cubietruck-led-triggers.patch
deleted file mode 100644
index d7941575b..000000000
--- a/kernels/linux-libre-x86_64/0006-set-default-cubietruck-led-triggers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a6e2f2d8098639d0ba04591a392617bcdbd03ab6 Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Sat, 14 Feb 2015 12:32:27 +0100
-Subject: [PATCH 6/9] set default cubietruck led triggers
-
-Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
----
- arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 ++
- 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 99f531b8d2a7..534392a72621 100644
---- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-@@ -78,6 +78,7 @@
- 		blue {
- 			label = "cubietruck:blue:usr";
- 			gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger = "heartbeat";
- 		};
- 
- 		orange {
-@@ -93,6 +94,7 @@
- 		green {
- 			label = "cubietruck:green:usr";
- 			gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger = "mmc0";
- 		};
- 	};
- 
--- 
-2.19.2
-
diff --git a/kernels/linux-libre-x86_64/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/kernels/linux-libre-x86_64/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
deleted file mode 100644
index dae931653..000000000
--- a/kernels/linux-libre-x86_64/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3cb9a065486a4e9fc5fa0e83cd91fb86c65078c8 Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Thu, 11 Aug 2016 00:42:37 -0600
-Subject: [PATCH 7/9] exynos4412-odroid: set higher minimum buck2 regulator
- voltage
-
-Set a higher minimum voltage to help reboot issue.
-http://www.spinics.net/lists/linux-samsung-soc/msg54434.html
-
-Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
----
- arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +-
- 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 3a9eb1e91c45..e990fb483905 100644
---- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-@@ -427,7 +427,7 @@
- 
- 			buck2_reg: BUCK2 {
- 				regulator-name = "vdd_arm";
--				regulator-min-microvolt = <900000>;
-+				regulator-min-microvolt = <1100000>;
- 				regulator-max-microvolt = <1350000>;
- 				regulator-always-on;
- 				regulator-boot-on;
--- 
-2.19.2
-
diff --git a/kernels/linux-libre-x86_64/0008-ARM-dove-enable-ethernet-on-D3Plug.patch b/kernels/linux-libre-x86_64/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
deleted file mode 100644
index 42c78d513..000000000
--- a/kernels/linux-libre-x86_64/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 67be64e425bf44f5fa496833cfb32b60bc74f917 Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Sun, 7 May 2017 13:32:25 -0600
-Subject: [PATCH 8/9] ARM: dove: enable ethernet on D3Plug
-
-Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
----
- arch/arm/boot/dts/dove-d3plug.dts | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm/boot/dts/dove-d3plug.dts b/arch/arm/boot/dts/dove-d3plug.dts
-index 826026c28f90..a4c9963e1261 100644
---- a/arch/arm/boot/dts/dove-d3plug.dts
-+++ b/arch/arm/boot/dts/dove-d3plug.dts
-@@ -61,6 +61,13 @@
- &uart0 { status = "okay"; };
- &sata0 { status = "okay"; };
- &i2c0 { status = "okay"; };
-+&mdio { status = "okay"; };
-+&eth { status = "okay"; };
-+
-+&ethphy {
-+	compatible = "marvell,88e1310";
-+	reg = <1>;
-+};
- 
- /* Samsung M8G2F eMMC */
- &sdio0 {
--- 
-2.19.2
-
diff --git a/kernels/linux-libre-x86_64/0009-media-s5p-mfc-fix-incorrect-bus-assignment-in-virtua.patch b/kernels/linux-libre-x86_64/0009-media-s5p-mfc-fix-incorrect-bus-assignment-in-virtua.patch
deleted file mode 100644
index 0deda34bf..000000000
--- a/kernels/linux-libre-x86_64/0009-media-s5p-mfc-fix-incorrect-bus-assignment-in-virtua.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5d3a19c0fd89f6721a01c882d37a6f114337edb7 Mon Sep 17 00:00:00 2001
-From: Marek Szyprowski <m.szyprowski@samsung.com>
-Date: Mon, 7 Jan 2019 13:04:14 +0100
-Subject: [PATCH 9/9] media: s5p-mfc: fix incorrect bus assignment in virtual
- child device
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Virtual MFC codec's child devices must not be assigned to platform bus,
-because they are allocated as raw 'struct device' and don't have the
-corresponding 'platform' part. This fixes NULL pointer access revealed
-recently by commit a66d972465d1 ("devres: Align data[] to
-ARCH_KMALLOC_MINALIGN").
-
-Reported-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
-Fixes: c79667dd93b0 ("media: s5p-mfc: replace custom reserved memory handling code with generic one")
-Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
-Tested-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
----
- drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
-index 8a5ba3bec3af..0a9f59d89185 100644
---- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
-+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
-@@ -1089,7 +1089,6 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev,
- 	device_initialize(child);
- 	dev_set_name(child, "%s:%s", dev_name(dev), name);
- 	child->parent = dev;
--	child->bus = dev->bus;
- 	child->coherent_dma_mask = dev->coherent_dma_mask;
- 	child->dma_mask = dev->dma_mask;
- 	child->release = s5p_mfc_memdev_release;
--- 
-2.19.2
-
diff --git a/kernels/linux-libre-x86_64/PKGBUILD b/kernels/linux-libre-x86_64/PKGBUILD
index ecb93f844..637d2b43a 100644
--- a/kernels/linux-libre-x86_64/PKGBUILD
+++ b/kernels/linux-libre-x86_64/PKGBUILD
@@ -1,19 +1,12 @@
-# Maintainer: David P. <megver83@parabola.nu>
-# Contributor: André Silva <emulatorman@hyperbola.info>
-# Contributor: Márcio Silva <coadde@hyperbola.info>
-# Contributor: fauno <fauno@parabola.nu>
-# Contributor: Sorin-Mihai Vârgolici <smv@yobicore.org>
-# Contributor: Michał Masłowski <mtjm@mtjm.eu>
-# Contributor: Luke R. <g4jc@openmailbox.org>
-# Contributor: Andreas Grapentin <andreas@grapentin.org>
-# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-
-# Based on linux package
+# Maintainer: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+# Feel free to push modifications or take over maintainership
+
+# Based on the linux-libre package
 
 pkgbase=linux-libre-x86_64         # Build stock kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_srcbasever=5.1-gnu
-_srcver=5.1.3-gnu
+_srcbasever=5.2-gnu
+_srcver=5.2.2-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -22,20 +15,21 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
 _srcname=linux-${_srcbasever%-*}
 _archpkgver=${_srcver%-*}
 pkgver=${_srcver//-/_}
-pkgrel=3
+pkgrel=1
 arch=(i686)
 url='https://linux-libre.fsfla.org/'
 license=(GPL2)
-makedepends=(xmlto kmod inetutils bc libelf)
+makedepends=(
+  xmlto kmod inetutils bc libelf python-sphinx python-sphinx_rtd_theme
+  graphviz imagemagick
+)
 makedepends+=('x86_64-pc-linux-gnu-gcc')
 options=('!strip')
 source=(
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/$_srcbasever/linux-libre-$_srcbasever.tar.xz"{,.sign}
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/$_srcver/patch-$_srcbasever-$_srcver.xz"{,.sign}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}
-  "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm"{,.sig}
-  "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"{,.sig}
-  parabola-x86_64_defconfig                  # the kernel configuration for the x86_64 architecture
+  config.x86_64                              # the kernel configuration for the x86_64 architecture
   60-linux.hook                              # pacman hook for depmod
   90-linux.hook                              # pacman hook for initramfs regeneration
   linux.preset                               # standard config files for mkinitcpio ramdisk
@@ -49,14 +43,19 @@ source=(
 
   # Arch's custom linux patches
   0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+  0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
+  0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
+  0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch
+  0005-netfilter-nf_tables-fix-module-autoload-for-redir.patch
 )
+
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
   '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
 )
-sha512sums=('42510bffa69746e0f919fecef5a23da4adb2473239ee67730fa1eb2340256fb4618c6acab439c01ae781df768a2e1ac4b76ad80fe0e4a432eaceb7f01f275439'
+sha512sums=('3359b0a10ac04243399a1b0aa84f6c09e3c1914880be19a7e931189da92900ca77e467e7ab5c296a03d2ff0ab3238ec75b13fd41bd2796049b63e71f6896900e'
             'SKIP'
-            'a84d9d60f754c7afc7a733721dc50a39f4c7e8d702f21bffcd4685564914a74259de9be2c19122c82db0606c1e984591b34248356a70000c3974ddb812e7330e'
+            '53bc4aa6a36d93ad9275c312e31bf90a19a274877632ba806e3e8c16c166a209968610b8db41c9d619eb57034445ceeb1753554fb459063c2a0600a208f9cdc8'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -64,17 +63,17 @@ sha512sums=('42510bffa69746e0f919fecef5a23da4adb2473239ee67730fa1eb2340256fb4618
             'SKIP'
             '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'
             'SKIP'
-            '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'
-            'SKIP'
-            '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
-            'SKIP'
-            'f3a1f1944fb7a107422365add1c5869e5cd558a1df8056230eaf454a9c8dd25abeeb49c20ea0c8f75c3eb72ebb5af1961fd748330889d63d8f60586ae477413c'
+            '0f175b422c7158a9b4feb3e447e777e3bcd3b89edc27026a13572bd85219361e6f2494356ece65b65c16aabcb5af0f4e2d02ebb14a799d8897af154503114a36'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '7748427819372a27b5aa9b3ce8cc8c75397bc3a76ac4fddd06f497ce5a1b34c2e15b6301e764e6e007ad66a49bb3f9c49e906c179875e115d213d2682ddb2576')
+            '38e1e19ac2536ffc0d9d6ea953597734151fc319e48fe7223618b51f362f504bf8164c7a439285063a1f81210928ea1d7524630d0e8c41bdcf3de221ead1e34f'
+            '20392a6552f39f40919597af3ad767c66f265ccb7ba8c38ee9122de8e1c4ff43285864f9535bef9ad8cca76918ab38bc1fb4db265cd45ccfdb3849e30b198a64'
+            'ac7220d35b9a0e9765aba42458702b23dfe5065e56dff1456a131ead2b165e2dd316548078a23641ebadd35dec8428b250c83d1f21fb1572728ceefe2096d699'
+            '00dceecb6b4a8da2deb757118a0a203d91926183bb42539d518ff2e2903b2750dc77f73f3f2e33aa13e1ec0578b05ad12d9828fd5d3a02caf9ca479f5e2f8db9'
+            '06738961d1c87b8f3bf6409dace1c8b99c0bd1a8c64d5070e2c88a23191401292b7c6dca018df76213451cdae2d3e7edc80b94ccfaa17986e5d2196cecfa9113')
 
 _kernelname=${pkgbase#linux-libre}
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
@@ -95,29 +94,31 @@ prepare() {
   install -m644 -t drivers/video/logo \
     ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
 
-  # Parabola changes
-  # Copy the parabola configuration in the source code
-  # - This makes sure that all the configuration of all
-  #   architectures are available in the source code
-  # - Using the built-in kenrel mechanism should take
-  #   care of making sure that no user input is required
-  cp -f ../parabola-x86_64_defconfig arch/x86/configs/
-  msg2 "Setting config..."
-  make CROSS_COMPILE=x86_64-pc-linux-gnu- parabola-x86_64_defconfig
-  # end of Parabola changes
-
   msg2 "Setting version..."
   scripts/setlocalversion --save-scmversion
   echo "-$pkgrel" > localversion.10-pkgrel
   echo "$_kernelname" > localversion.20-pkgname
 
-  make -s kernelrelease > ../version
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    msg2 "Applying patch $src..."
+    patch -Np1 < "../$src"
+  done
+
+  msg2 "Setting config..."
+  cp ../config.x86_64 .config
+  make CROSS_COMPILE=x86_64-pc-linux-gnu- olddefconfig
+
+  make CROSS_COMPILE=x86_64-pc-linux-gnu- -s kernelrelease > ../version
   msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)"
 }
 
 build() {
   cd $_srcname
-  make CROSS_COMPILE=x86_64-pc-linux-gnu- bzImage modules
+  make CROSS_COMPILE=x86_64-pc-linux-gnu- bzImage modules htmldocs
 }
 
 _package() {
@@ -279,6 +280,18 @@ _package-docs() {
   mkdir -p "$builddir"
   cp -t "$builddir" -a Documentation
 
+  msg2 "Removing doctrees..."
+  rm -r "$builddir/Documentation/output/.doctrees"
+
+  msg2 "Moving HTML docs..."
+  local src dst
+  while read -rd '' src; do
+    dst="$builddir/Documentation/${src#$builddir/Documentation/output/}"
+    mkdir -p "${dst%/*}"
+    mv "$src" "$dst"
+    rmdir -p --ignore-fail-on-non-empty "${src%/*}"
+  done < <(find "$builddir/Documentation/output" -type f -print0)
+
   msg2 "Adding symlink..."
   mkdir -p "$pkgdir/usr/share/doc"
   ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
diff --git a/kernels/linux-libre-x86_64/parabola-x86_64_defconfig b/kernels/linux-libre-x86_64/config.x86_64
index dec54ff59..1b8de67ea 100644
--- a/kernels/linux-libre-x86_64/parabola-x86_64_defconfig
+++ b/kernels/linux-libre-x86_64/config.x86_64
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.1.3-gnu Kernel Configuration
+# Linux/x86 5.2.2-gnu Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 8.3.0
+# Compiler: x86_64-pc-linux-gnu-gcc (GCC) 9.1.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80300
+CONFIG_GCC_VERSION=90100
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
@@ -66,6 +66,8 @@ CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
@@ -88,6 +90,8 @@ CONFIG_CONTEXT_TRACKING=y
 # CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -108,6 +112,8 @@ CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_PSI=y
 # CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
 CONFIG_CPU_ISOLATION=y
 
 #
@@ -126,9 +132,12 @@ CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_RCU_BOOST=y
 CONFIG_RCU_BOOST_DELAY=500
 CONFIG_RCU_NOCB_CPU=y
+# end of RCU Subsystem
+
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+# CONFIG_IKHEADERS is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
@@ -167,6 +176,7 @@ CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
+CONFIG_USER_NS_UNPRIVILEGED=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
@@ -184,7 +194,6 @@ CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
@@ -233,6 +242,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
@@ -243,10 +254,13 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SLUB_CPU_PARTIAL is not set
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+# end of General setup
+
 CONFIG_64BIT=y
 CONFIG_X86_64=y
 CONFIG_X86=y
@@ -263,9 +277,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -279,7 +291,6 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ZONE_DMA32=y
 CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
@@ -312,7 +323,6 @@ CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_XXL=y
 # CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_PARAVIRT_SPINLOCKS=y
-# CONFIG_QUEUED_LOCK_STAT is not set
 CONFIG_XEN=y
 CONFIG_XEN_PV=y
 CONFIG_XEN_PV_SMP=y
@@ -378,6 +388,8 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=m
 CONFIG_PERF_EVENTS_INTEL_RAPL=m
 CONFIG_PERF_EVENTS_INTEL_CSTATE=m
 CONFIG_PERF_EVENTS_AMD_POWER=m
+# end of Performance monitoring
+
 CONFIG_X86_16BIT=y
 CONFIG_X86_ESPFIX64=y
 CONFIG_X86_VSYSCALL_EMULATION=y
@@ -456,6 +468,8 @@ CONFIG_LEGACY_VSYSCALL_NONE=y
 CONFIG_MODIFY_LDT_SYSCALL=y
 CONFIG_HAVE_LIVEPATCH=y
 # CONFIG_LIVEPATCH is not set
+# end of Processor type and features
+
 CONFIG_ARCH_HAS_ADD_PAGES=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -537,6 +551,7 @@ CONFIG_ACPI_BGRT=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 CONFIG_ACPI_NFIT=m
 # CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_HMAT=y
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_ACPI_APEI=y
@@ -598,6 +613,7 @@ CONFIG_X86_P4_CLOCKMOD=m
 # shared options
 #
 CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
 
 #
 # CPU Idle
@@ -606,7 +622,10 @@ CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_IDLE_GOV_TEO=y
+# end of CPU Idle
+
 CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
 
 #
 # Bus options (PCI etc.)
@@ -620,6 +639,7 @@ CONFIG_MMCONF_FAM10H=y
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 # CONFIG_X86_SYSFB is not set
+# end of Bus options (PCI etc.)
 
 #
 # Binary Emulations
@@ -630,6 +650,8 @@ CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
+# end of Binary Emulations
+
 CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_HAVE_GENERIC_GUP=y
 
@@ -660,6 +682,8 @@ CONFIG_EFI_CAPSULE_LOADER=m
 # CONFIG_EFI_TEST is not set
 CONFIG_APPLE_PROPERTIES=y
 # CONFIG_RESET_ATTACK_MITIGATION is not set
+# end of EFI (Extensible Firmware Interface) Support
+
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
 CONFIG_EFI_DEV_PATH_PARSER=y
@@ -668,6 +692,9 @@ CONFIG_EFI_EARLYCON=y
 #
 # Tegra firmware driver
 #
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
@@ -724,6 +751,7 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
@@ -740,7 +768,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -779,6 +806,7 @@ CONFIG_HAVE_RELIABLE_STACKTRACE=y
 CONFIG_ISA_BUS_API=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_64BIT_TIME=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
@@ -790,15 +818,28 @@ CONFIG_ARCH_HAS_REFCOUNT=y
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
+CONFIG_LOCK_EVENT_COUNTS=y
 
 #
 # GCOV-based kernel profiling
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
 CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -860,6 +901,8 @@ CONFIG_KARMA_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
@@ -873,6 +916,8 @@ CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
+# end of IO Schedulers
+
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -899,6 +944,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
+# end of Executable file formats
 
 #
 # Memory Management options
@@ -912,7 +958,6 @@ CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 CONFIG_MEMORY_HOTPLUG=y
@@ -924,6 +969,7 @@ CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
@@ -955,6 +1001,8 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_ARCH_HAS_ZONE_DEVICE=y
 CONFIG_ZONE_DEVICE=y
+CONFIG_ARCH_HAS_HMM_MIRROR=y
+CONFIG_ARCH_HAS_HMM_DEVICE=y
 CONFIG_ARCH_HAS_HMM=y
 CONFIG_MIGRATE_VMA_HELPER=y
 CONFIG_DEV_PAGEMAP_OPS=y
@@ -968,6 +1016,8 @@ CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -1029,9 +1079,6 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
@@ -1070,10 +1117,6 @@ CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
-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=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -1141,7 +1184,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1216,6 +1258,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -1272,6 +1315,8 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
 CONFIG_IP_SET=m
 CONFIG_IP_SET_MAX=256
 CONFIG_IP_SET_BITMAP_IP=m
@@ -1346,7 +1391,6 @@ CONFIG_NF_DEFRAG_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
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
@@ -1380,6 +1424,7 @@ CONFIG_IP_NF_SECURITY=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
@@ -1387,7 +1432,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -1416,6 +1460,8 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_TABLES_BRIDGE=y
 CONFIG_NFT_BRIDGE_REJECT=m
@@ -1452,11 +1498,14 @@ CONFIG_INET_DCCP_DIAG=m
 CONFIG_IP_DCCP_CCID3=y
 # CONFIG_IP_DCCP_CCID3_DEBUG is not set
 CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
 
 #
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
@@ -1493,17 +1542,21 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
-# CONFIG_NET_DSA_LEGACY is not set
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
-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
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1639,6 +1692,7 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
 # CONFIG_BATMAN_ADV_TRACING is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -1677,6 +1731,9 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 CONFIG_NET_PKTGEN=m
 CONFIG_NET_DROP_MONITOR=m
+# end of Network testing
+# end of Networking options
+
 CONFIG_HAMRADIO=y
 
 #
@@ -1697,6 +1754,8 @@ CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_YAM=m
+# end of AX.25 network device drivers
+
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
@@ -1740,6 +1799,7 @@ CONFIG_CAN_SOFTING_CS=m
 #
 CONFIG_CAN_HI311X=m
 CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
 
 #
 # CAN USB interfaces
@@ -1752,7 +1812,11 @@ CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_MCBA_USB=m
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
 # CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
@@ -1804,8 +1868,11 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 # CONFIG_BT_ATH3K is not set
+CONFIG_BT_MTKSDIO=m
 # CONFIG_BT_MTKUART is not set
 CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
@@ -1906,6 +1973,8 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
@@ -1977,6 +2046,8 @@ CONFIG_HOTPLUG_PCI_SHPC=y
 CONFIG_PCIE_CADENCE=y
 CONFIG_PCIE_CADENCE_HOST=y
 CONFIG_PCIE_CADENCE_EP=y
+# end of Cadence PCIe controllers support
+
 CONFIG_PCI_FTPCI100=y
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
@@ -1993,6 +2064,8 @@ CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_PCIE_DW_PLAT_EP=y
 CONFIG_PCI_MESON=y
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
 
 #
 # PCI Endpoint
@@ -2000,11 +2073,14 @@ CONFIG_PCI_MESON=y
 CONFIG_PCI_ENDPOINT=y
 CONFIG_PCI_ENDPOINT_CONFIGFS=y
 # CONFIG_PCI_EPF_TEST is not set
+# end of PCI Endpoint
 
 #
 # PCI switch controller drivers
 #
 CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -2040,6 +2116,7 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
 
 #
 # Generic Driver Options
@@ -2057,12 +2134,15 @@ CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# end of Firmware loader
+
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 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_HMEM_REPORTING=y
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_SYS_HYPERVISOR=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
@@ -2078,11 +2158,14 @@ CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_SOUNDWIRE=m
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
 
 #
 # Bus devices
 #
 CONFIG_SIMPLE_PM_BUS=y
+# end of Bus devices
+
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_GNSS=m
@@ -2103,6 +2186,7 @@ CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
 
 #
 # User Modules And Translation Layers
@@ -2140,6 +2224,7 @@ CONFIG_MTD_CFI_UTIL=m
 CONFIG_MTD_RAM=m
 CONFIG_MTD_ROM=m
 CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
 
 #
 # Mapping drivers for chip access
@@ -2164,6 +2249,7 @@ CONFIG_MTD_PCMCIA=m
 # CONFIG_MTD_PCMCIA_ANONYMOUS is not set
 CONFIG_MTD_INTEL_VR_NOR=m
 CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
 
 #
 # Self-contained MTD device drivers
@@ -2190,30 +2276,39 @@ CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_DOCG3=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
 CONFIG_MTD_NAND_CORE=m
 CONFIG_MTD_ONENAND=m
 # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
 CONFIG_MTD_ONENAND_GENERIC=m
 CONFIG_MTD_ONENAND_OTP=y
 CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_BCH=m
-CONFIG_MTD_NAND_ECC_BCH=y
-CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC=y
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
 CONFIG_MTD_NAND_DENALI=m
 CONFIG_MTD_NAND_DENALI_PCI=m
 CONFIG_MTD_NAND_DENALI_DT=m
+CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_SPI_NAND=m
 
 #
@@ -2221,6 +2316,8 @@ CONFIG_MTD_SPI_NAND=m
 #
 CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
 CONFIG_MTD_SPI_NOR=m
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_SPI_MTK_QUADSPI=m
@@ -2310,6 +2407,7 @@ CONFIG_NVME_TARGET_RDMA=m
 CONFIG_NVME_TARGET_FC=m
 CONFIG_NVME_TARGET_FCLOOP=m
 CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
 
 #
 # Misc devices
@@ -2356,6 +2454,8 @@ CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2364,6 +2464,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # Texas Instruments shared transport line discipline
 #
 # CONFIG_TI_ST is not set
+# end of Texas Instruments shared transport line discipline
+
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
@@ -2416,6 +2518,8 @@ CONFIG_MIC_COSM=m
 #
 CONFIG_VOP=m
 CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
 CONFIG_GENWQE=m
 CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 CONFIG_ECHO=m
@@ -2423,6 +2527,8 @@ CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
 CONFIG_HABANA_AI=m
+# end of Misc devices
+
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2462,6 +2568,8 @@ CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
 CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2575,6 +2683,8 @@ CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
 CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
@@ -2710,6 +2820,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
@@ -2745,6 +2856,8 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=m
 CONFIG_NETDEVICES=y
@@ -2841,18 +2954,22 @@ CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA_LANTIQ_GSWIP=m
 CONFIG_NET_DSA_MT7530=m
+CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_SJA1105=m
 CONFIG_NET_DSA_QCA8K=m
 CONFIG_NET_DSA_REALTEK_SMI=m
 CONFIG_NET_DSA_SMSC_LAN9303=m
 CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
 CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
 CONFIG_NET_DSA_VITESSE_VSC73XX=m
+# end of Distributed Switch Architecture drivers
+
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -3145,7 +3262,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TI_CPSW_ALE=m
 CONFIG_TLAN=m
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
@@ -3158,6 +3274,8 @@ CONFIG_WIZNET_W5300=m
 # CONFIG_WIZNET_BUS_INDIRECT is not set
 CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_LL_TEMAC=m
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_FDDI=m
@@ -3192,7 +3310,7 @@ CONFIG_LED_TRIGGER_PHY=y
 CONFIG_SFP=m
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
-CONFIG_ASIX_PHY=m
+CONFIG_AX88796B_PHY=m
 CONFIG_AT803X_PHY=m
 CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m
@@ -3375,6 +3493,8 @@ CONFIG_IWL3945=m
 #
 CONFIG_IWLEGACY_DEBUG=y
 CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
 # CONFIG_IWLWIFI is not set
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
@@ -3427,6 +3547,7 @@ CONFIG_MT76x0E=m
 # CONFIG_MT76x2E is not set
 # CONFIG_MT76x2U is not set
 # CONFIG_MT7603E is not set
+# CONFIG_MT7615E is not set
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3475,6 +3596,7 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 CONFIG_RTL8XXXU_UNTESTED=y
+# CONFIG_RTW88 is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 CONFIG_RSI_DEBUGFS=y
@@ -3512,6 +3634,8 @@ CONFIG_VIRT_WIFI=m
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
@@ -3547,6 +3671,7 @@ CONFIG_ISDN_TTY_FAX=y
 # ISDN feature submodules
 #
 CONFIG_ISDN_DIVERSION=m
+# end of ISDN feature submodules
 
 #
 # ISDN4Linux hardware drivers
@@ -3607,6 +3732,8 @@ CONFIG_HISAX_ST5481=m
 CONFIG_HISAX_HFCUSB=m
 CONFIG_HISAX_HFC4S8S=m
 CONFIG_HISAX_FRITZ_PCIPNP=m
+# end of Passive cards
+
 CONFIG_ISDN_CAPI=m
 CONFIG_CAPI_TRACE=y
 CONFIG_ISDN_CAPI_CAPI20=m
@@ -3684,6 +3811,7 @@ CONFIG_KEYBOARD_ADP5520=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
 CONFIG_KEYBOARD_ATKBD=m
+CONFIG_KEYBOARD_QT1050=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 CONFIG_KEYBOARD_DLINK_DIR685=m
@@ -3889,6 +4017,7 @@ CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+# CONFIG_TOUCHSCREEN_IQS5XX is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_88PM860X_ONKEY=m
 CONFIG_INPUT_88PM80X_ONKEY=m
@@ -3901,6 +4030,7 @@ CONFIG_INPUT_BMA150=m
 CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_MSM_VIBRATOR=m
 CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77650_ONKEY=m
 CONFIG_INPUT_MAX77693_HAPTIC=m
 CONFIG_INPUT_MAX8925_ONKEY=m
 CONFIG_INPUT_MAX8997_HAPTIC=m
@@ -3910,6 +4040,7 @@ CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_CPCAP_PWRBUTTON=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
@@ -3983,7 +4114,6 @@ CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_HYPERV_KEYBOARD=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_USERIO=m
@@ -3992,6 +4122,8 @@ CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
 
 #
 # Character devices
@@ -4020,6 +4152,7 @@ CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 # CONFIG_DEVKMEM is not set
@@ -4063,6 +4196,7 @@ CONFIG_SERIAL_UARTLITE_NR_UARTS=1
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SIFIVE=m
 CONFIG_SERIAL_SCCNXP=m
 CONFIG_SERIAL_SC16IS7XX_CORE=m
 CONFIG_SERIAL_SC16IS7XX=m
@@ -4081,6 +4215,8 @@ CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 CONFIG_SERIAL_MEN_Z135=m
+# end of Serial drivers
+
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 # CONFIG_TTY_PRINTK is not set
@@ -4118,6 +4254,8 @@ CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
 CONFIG_SCR24X=m
 CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
 CONFIG_MWAVE=m
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=256
@@ -4147,6 +4285,8 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
+# end of Character devices
+
 # CONFIG_RANDOM_TRUST_CPU is not set
 
 #
@@ -4172,6 +4312,8 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
 CONFIG_I2C_DEMUX_PINCTRL=m
 CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -4190,6 +4332,7 @@ CONFIG_I2C_ALI15X3=m
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
@@ -4246,12 +4389,16 @@ CONFIG_I2C_VIPERBOARD=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_CROS_EC_TUNNEL=m
 CONFIG_I2C_FSI=m
+# end of I2C Hardware Bus support
+
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
 CONFIG_I3C=m
 CONFIG_CDNS_I3C_MASTER=m
 CONFIG_DW_I3C_MASTER=m
@@ -4331,6 +4478,8 @@ CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_DP83640_PHY=m
 CONFIG_PTP_1588_CLOCK_KVM=m
+# end of PTP clock support
+
 CONFIG_PINCTRL=y
 CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
@@ -4344,6 +4493,7 @@ CONFIG_PINCTRL_AMD=m
 CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_SINGLE=m
 CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_STMFX=m
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_PINCTRL_PALMAS=m
 CONFIG_PINCTRL_RK805=m
@@ -4359,6 +4509,7 @@ CONFIG_PINCTRL_GEMINILAKE=y
 CONFIG_PINCTRL_ICELAKE=y
 CONFIG_PINCTRL_LEWISBURG=y
 CONFIG_PINCTRL_SUNRISEPOINT=y
+CONFIG_PINCTRL_LOCHNAGAR=m
 CONFIG_PINCTRL_MADERA=m
 CONFIG_PINCTRL_CS47L35=y
 CONFIG_PINCTRL_CS47L85=y
@@ -4390,13 +4541,13 @@ CONFIG_GPIO_ICH=m
 CONFIG_GPIO_LYNXPOINT=m
 CONFIG_GPIO_MB86S7X=m
 CONFIG_GPIO_MENZ127=m
-CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_SAMA5D2_PIOBU=m
 CONFIG_GPIO_SIOX=m
 CONFIG_GPIO_SYSCON=m
 CONFIG_GPIO_VX855=m
 CONFIG_GPIO_XILINX=m
 CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
 
 #
 # Port-mapped I/O GPIO drivers
@@ -4407,6 +4558,7 @@ CONFIG_GPIO_SCH=m
 CONFIG_GPIO_SCH311X=m
 CONFIG_GPIO_WINBOND=m
 CONFIG_GPIO_WS16C48=m
+# end of Port-mapped I/O GPIO drivers
 
 #
 # I2C GPIO expanders
@@ -4419,6 +4571,7 @@ CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
 
 #
 # MFD GPIO expanders
@@ -4437,6 +4590,7 @@ CONFIG_GPIO_LP873X=m
 CONFIG_GPIO_LP87565=m
 CONFIG_GPIO_MADERA=m
 CONFIG_GPIO_MAX77620=m
+CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_STMPE=y
@@ -4455,6 +4609,7 @@ CONFIG_GPIO_WHISKEY_COVE=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_WM8350=m
 CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
 
 #
 # PCI GPIO expanders
@@ -4466,6 +4621,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 CONFIG_GPIO_PCIE_IDIO_24=m
 CONFIG_GPIO_RDC321X=m
 CONFIG_GPIO_SODAVILLE=y
+# end of PCI GPIO expanders
 
 #
 # SPI GPIO expanders
@@ -4476,11 +4632,15 @@ CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
 CONFIG_GPIO_XRA1403=m
+# end of SPI GPIO expanders
 
 #
 # USB GPIO expanders
 #
 CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+CONFIG_GPIO_MOCKUP=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4492,6 +4652,7 @@ CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
 
 #
 # 1-wire Slaves
@@ -4513,6 +4674,8 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
 CONFIG_POWER_AVS=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_AS3722=y
@@ -4572,9 +4735,10 @@ CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_LP8788=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_MANAGER=y
-CONFIG_CHARGER_LTC3651=m
+CONFIG_CHARGER_LT3651=m
 CONFIG_CHARGER_MAX14577=m
 CONFIG_CHARGER_DETECTOR_MAX14656=m
+CONFIG_CHARGER_MAX77650=m
 CONFIG_CHARGER_MAX77693=m
 CONFIG_CHARGER_MAX8997=m
 CONFIG_CHARGER_MAX8998=m
@@ -4590,6 +4754,7 @@ CONFIG_BATTERY_GAUGE_LTC2941=m
 CONFIG_BATTERY_RT5033=m
 CONFIG_CHARGER_RT9455=m
 CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_UCS1002=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4650,6 +4815,7 @@ CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_POWR1220=m
 CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LOCHNAGAR=m
 CONFIG_SENSORS_LTC2945=m
 CONFIG_SENSORS_LTC2990=m
 CONFIG_SENSORS_LTC4151=m
@@ -4699,15 +4865,14 @@ CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
-CONFIG_SENSORS_OCC_P8_I2C=m
-CONFIG_SENSORS_OCC_P9_SBE=m
-CONFIG_SENSORS_OCC=y
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_IBM_CFFPS=m
 CONFIG_SENSORS_IR35221=m
+CONFIG_SENSORS_IR38064=m
+CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
@@ -4798,6 +4963,7 @@ CONFIG_CPU_THERMAL=y
 CONFIG_CLOCK_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
+CONFIG_THERMAL_MMIO=m
 CONFIG_MAX77620_THERMAL=m
 CONFIG_QORIQ_THERMAL=m
 CONFIG_DA9062_THERMAL=m
@@ -4816,8 +4982,12 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 CONFIG_INT3406_THERMAL=m
+# end of ACPI INT340X thermal drivers
+
 CONFIG_INTEL_BXT_PMIC_THERMAL=m
 CONFIG_INTEL_PCH_THERMAL=m
+# end of Intel thermal drivers
+
 CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
@@ -4826,6 +4996,16 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 CONFIG_WATCHDOG_SYSFS=y
 
 #
+# Watchdog Pretimeout Governors
+#
+CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=m
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
+# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP is not set
+CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC=y
+
+#
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
@@ -4871,8 +5051,8 @@ CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
 CONFIG_HP_WATCHDOG=m
-CONFIG_KEMPLD_WDT=m
 CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
 CONFIG_SC1200_WDT=m
 CONFIG_PC87413_WDT=m
 CONFIG_NV_TCO=m
@@ -4903,15 +5083,6 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
-
-#
-# Watchdog Pretimeout Governors
-#
-CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
-# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP is not set
-CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC=y
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=m
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
@@ -4989,6 +5160,7 @@ CONFIG_MFD_88PM805=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_MAX14577=m
 CONFIG_MFD_MAX77620=y
+CONFIG_MFD_MAX77650=m
 CONFIG_MFD_MAX77686=m
 CONFIG_MFD_MAX77693=m
 CONFIG_MFD_MAX77843=y
@@ -5027,6 +5199,8 @@ CONFIG_MFD_STMPE=y
 #
 CONFIG_STMPE_I2C=y
 CONFIG_STMPE_SPI=y
+# end of STMicroelectronics STMPE Interface Drivers
+
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_LP3943=m
@@ -5075,7 +5249,10 @@ CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=m
 CONFIG_MFD_ROHM_BD718XX=m
 CONFIG_MFD_STPMIC1=m
+CONFIG_MFD_STMFX=m
 CONFIG_RAVE_SP_CORE=m
+# end of Multifunction device drivers
+
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
@@ -5126,6 +5303,7 @@ CONFIG_REGULATOR_LTC3676=m
 CONFIG_REGULATOR_MAX14577=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX77620=m
+CONFIG_REGULATOR_MAX77650=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8907=m
@@ -5240,7 +5418,7 @@ CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_CEC_PIN_ERROR_INJ is not set
 CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
+CONFIG_MEDIA_CONTROLLER_DVB=y
 # CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
@@ -5567,6 +5745,7 @@ CONFIG_RADIO_WL1273=m
 #
 # Texas Instruments WL128x FM driver (ST based)
 #
+# end of Texas Instruments WL128x FM driver (ST based)
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -5629,17 +5808,11 @@ CONFIG_VIDEO_SAA6588=m
 #
 CONFIG_VIDEO_ADV7604=m
 CONFIG_VIDEO_ADV7842=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_TVP5150=m
 CONFIG_VIDEO_TW2804=m
 CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_VPX3220=m
 
 #
 # Video and audio decoders
@@ -5651,9 +5824,6 @@ CONFIG_VIDEO_CX25840=m
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_ADV7511=m
 
 #
@@ -5665,6 +5835,10 @@ CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_MT9V011=m
 
 #
+# Lens drivers
+#
+
+#
 # Flash devices
 #
 
@@ -5692,6 +5866,8 @@ CONFIG_VIDEO_M52790=m
 # Media SPI Adapters
 #
 CONFIG_CXD2880_SPI_DRV=m
+# end of Media SPI Adapters
+
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
@@ -5913,7 +6089,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_TTM=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
-CONFIG_DRM_VM=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=m
 
 #
@@ -5923,11 +6099,14 @@ CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_NXP_TDA9950=m
+# end of I2C encoder or helper chips
 
 #
 # ARM devices
 #
 CONFIG_DRM_KOMEDA=m
+# end of ARM devices
+
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
@@ -5940,6 +6119,7 @@ CONFIG_DRM_AMDGPU_USERPTR=y
 # ACP (Audio CoProcessor) Configuration
 #
 CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
 
 #
 # Display Engine Configuration
@@ -5948,20 +6128,16 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMD_DC_DCN1_0=y
 CONFIG_DRM_AMD_DC_DCN1_01=y
 # CONFIG_DEBUG_KERNEL_DC is not set
-CONFIG_HSA_AMD=y
+# end of Display Engine Configuration
 
-#
-# AMD Library routines
-#
-CONFIG_CHASH=m
-# CONFIG_CHASH_STATS is not set
-# CONFIG_CHASH_SELFTEST is not set
+CONFIG_HSA_AMD=y
 CONFIG_DRM_NOUVEAU=m
+# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-# CONFIG_DRM_NOUVEAU_SVM is not set
+CONFIG_DRM_NOUVEAU_SVM=y
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_ALPHA_SUPPORT=y
 CONFIG_DRM_I915_CAPTURE_ERROR=y
@@ -5982,6 +6158,8 @@ CONFIG_DRM_I915_GVT_KVMGT=m
 # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
 # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
 # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX=m
@@ -6006,6 +6184,7 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
@@ -6018,6 +6197,8 @@ 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_ROCKTECH_JH057N00900=m
+CONFIG_DRM_PANEL_RONBO_RB070D30=m
 CONFIG_DRM_PANEL_SAMSUNG_S6D16D0=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
@@ -6029,6 +6210,8 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+# end of Display Panels
+
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
 
@@ -6058,6 +6241,8 @@ CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
+# end of Display Interface Bridges
+
 # CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_ARCPGU=m
 CONFIG_DRM_HISI_HIBMC=m
@@ -6074,6 +6259,7 @@ CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
 CONFIG_DRM_XEN=y
 CONFIG_DRM_XEN_FRONTEND=m
+CONFIG_DRM_VBOXVIDEO=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
@@ -6149,7 +6335,11 @@ CONFIG_FB_HYPERV=m
 CONFIG_FB_SIMPLE=y
 # CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
@@ -6193,6 +6383,8 @@ CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
 CONFIG_BACKLIGHT_ARCXCNN=m
 CONFIG_BACKLIGHT_RAVE_SP=m
+# end of Backlight & LCD device support
+
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
 
@@ -6210,7 +6402,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
 # CONFIG_LOGO is not set
+# end of Graphics support
+
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -6367,6 +6563,8 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m
 CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+# end of HD-Audio
+
 CONFIG_SND_HDA_CORE=m
 CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_COMPONENT=y
@@ -6376,6 +6574,7 @@ CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
@@ -6427,11 +6626,14 @@ CONFIG_SND_DESIGNWARE_PCM=y
 #
 # CONFIG_SND_SOC_FSL_ASRC is not set
 # CONFIG_SND_SOC_FSL_SAI is not set
+CONFIG_SND_SOC_FSL_AUDMIX=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 CONFIG_SND_SOC_FSL_MICFIL=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
 CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
@@ -6488,11 +6690,51 @@ CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
 CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
 CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_ACPI=m
+CONFIG_SND_SOC_SOF_INTEL_PCI=m
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_ICELAKE=m
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_XTENSA=m
 
 #
 # STMicroelectronics STM32 SOC audio support
 #
+# end of STMicroelectronics STM32 SOC audio support
+
 CONFIG_SND_SOC_XILINX_I2S=m
 CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
 CONFIG_SND_SOC_XILINX_SPDIF=m
@@ -6560,6 +6802,7 @@ CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_LOCHNAGAR_SC=m
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98357A=m
@@ -6675,6 +6918,8 @@ CONFIG_SND_SOC_NAU8822=m
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
 CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
@@ -6711,6 +6956,7 @@ CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CORSAIR=m
 CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CMEDIA=m
 CONFIG_HID_CP2112=m
@@ -6793,6 +7039,7 @@ CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -6802,6 +7049,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 CONFIG_HID_ALPS=m
+# end of Special HID drivers
 
 #
 # USB HID support
@@ -6815,16 +7063,23 @@ CONFIG_USB_HIDDEV=y
 #
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
 
 #
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+# end of I2C HID support
 
 #
 # Intel ISH HID support
 #
 CONFIG_INTEL_ISH_HID=m
+CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
+# end of Intel ISH HID support
+# end of HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -7082,6 +7337,8 @@ CONFIG_USB_GPIO_VBUS=m
 CONFIG_TAHVO_USB=m
 # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -7116,6 +7373,8 @@ CONFIG_USB_GOKU=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_GADGET_XILINX=m
 CONFIG_USB_DUMMY_HCD=m
+# end of USB Peripheral Controller
+
 CONFIG_USB_LIBCOMPOSITE=m
 CONFIG_USB_F_ACM=m
 CONFIG_USB_F_SS_LB=m
@@ -7196,7 +7455,7 @@ CONFIG_TYPEC_RT1711H=m
 CONFIG_TYPEC_FUSB302=m
 CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPEC_UCSI=m
-CONFIG_UCSI_CCG=m
+# CONFIG_UCSI_CCG is not set
 CONFIG_UCSI_ACPI=m
 CONFIG_TYPEC_TPS6598X=m
 
@@ -7204,11 +7463,15 @@ CONFIG_TYPEC_TPS6598X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 CONFIG_TYPEC_MUX_PI3USB30532=m
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
 CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_ROLES_INTEL_XHCI=m
 CONFIG_USB_LED_TRIG=y
@@ -7231,6 +7494,7 @@ CONFIG_MMC_TEST=m
 #
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_ACPI=m
@@ -7294,6 +7558,7 @@ CONFIG_LEDS_BCM6358=m
 CONFIG_LEDS_CPCAP=m
 CONFIG_LEDS_CR0014114=m
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
 CONFIG_LEDS_LM3692X=m
@@ -7329,6 +7594,7 @@ CONFIG_LEDS_ADP5520=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX77650=m
 CONFIG_LEDS_MAX77693=m
 CONFIG_LEDS_MAX8997=m
 CONFIG_LEDS_LM355x=m
@@ -7387,6 +7653,7 @@ CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_QIB_DCA=y
 CONFIG_INFINIBAND_CXGB3=m
 CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
 CONFIG_INFINIBAND_I40IW=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
@@ -7622,6 +7889,8 @@ CONFIG_DMA_ENGINE_RAID=y
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
+# end of DMABUF options
+
 CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
 CONFIG_HD44780=m
@@ -7682,6 +7951,7 @@ CONFIG_HYPERV=m
 CONFIG_HYPERV_TSCPAGE=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
 
 #
 # Xen driver support
@@ -7717,6 +7987,8 @@ CONFIG_XEN_ACPI=y
 CONFIG_XEN_SYMS=y
 CONFIG_XEN_HAVE_VPMU=y
 CONFIG_XEN_FRONT_PGDIR_SHBUF=m
+# end of Xen driver support
+
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
@@ -7820,7 +8092,6 @@ CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-# CONFIG_R8822BE is not set
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -7834,14 +8105,15 @@ CONFIG_VT6656=m
 #
 CONFIG_ADIS16203=m
 CONFIG_ADIS16240=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD7780=m
 CONFIG_AD7816=m
 CONFIG_AD7192=m
 CONFIG_AD7280=m
+# end of Analog to digital converters
 
 #
 # Analog digital bi-direction converters
@@ -7849,23 +8121,27 @@ CONFIG_AD7280=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_SPI=m
 CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
 
 #
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
 CONFIG_AD7746=m
+# end of Capacitance to digital converters
 
 #
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
 CONFIG_AD9834=m
+# end of Direct Digital Synthesis
 
 #
 # Network Analyzer, Impedance Converters
 #
 CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
 
 #
 # Active energy metering IC
@@ -7873,12 +8149,16 @@ CONFIG_AD5933=m
 CONFIG_ADE7854=m
 CONFIG_ADE7854_I2C=m
 CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
-CONFIG_FB_SM750=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+# CONFIG_FB_SM750 is not set
 
 #
 # Speakup console speech
@@ -7895,16 +8175,10 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
 # CONFIG_VIDEO_IPU3_IMGU is not set
 
 #
@@ -7914,6 +8188,8 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m
 #
 # Android
 #
+# end of Android
+
 CONFIG_STAGING_BOARD=y
 CONFIG_LTE_GDM724X=m
 CONFIG_FIREWIRE_SERIAL=m
@@ -7921,6 +8197,9 @@ CONFIG_FWTTY_MAX_TOTAL_PORTS=64
 CONFIG_FWTTY_MAX_CARD_PORTS=32
 CONFIG_GS_FPGABOOT=m
 CONFIG_UNISYSSPAR=y
+CONFIG_UNISYS_VISORNIC=m
+CONFIG_UNISYS_VISORINPUT=m
+CONFIG_UNISYS_VISORHBA=m
 CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
 # CONFIG_FB_TFT is not set
 CONFIG_WILC1000=m
@@ -7937,7 +8216,6 @@ CONFIG_MOST_I2C=m
 CONFIG_MOST_USB=m
 CONFIG_KS7010=m
 # CONFIG_GREYBUS is not set
-CONFIG_DRM_VBOXVIDEO=m
 CONFIG_PI433=m
 
 #
@@ -7945,6 +8223,8 @@ CONFIG_PI433=m
 #
 CONFIG_STAGING_GASKET_FRAMEWORK=m
 CONFIG_STAGING_APEX_DRIVER=m
+# end of Gasket devices
+
 CONFIG_XIL_AXIS_FIFO=m
 CONFIG_EROFS_FS=m
 # CONFIG_EROFS_FS_DEBUG is not set
@@ -7959,6 +8239,15 @@ CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=2
 # CONFIG_EROFS_FS_ZIP_NO_CACHE is not set
 # CONFIG_EROFS_FS_ZIP_CACHE_UNIPOLAR is not set
 CONFIG_EROFS_FS_ZIP_CACHE_BIPOLAR=y
+CONFIG_FIELDBUS_DEV=m
+CONFIG_HMS_ANYBUSS_BUS=m
+CONFIG_ARCX_ANYBUS_CONTROLLER=m
+CONFIG_HMS_PROFINET=m
+CONFIG_KPC2000=y
+CONFIG_KPC2000_CORE=m
+CONFIG_KPC2000_SPI=m
+CONFIG_KPC2000_I2C=m
+CONFIG_KPC2000_DMA=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACER_WIRELESS=m
@@ -8016,7 +8305,6 @@ CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_TOSHIBA_WMI=m
-CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_CHT_INT33FE=m
 CONFIG_INTEL_INT0002_VGPIO=m
 CONFIG_INTEL_HID_EVENT=m
@@ -8027,7 +8315,6 @@ CONFIG_IBM_RTL=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
 CONFIG_APPLE_GMUX=m
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
@@ -8050,6 +8337,7 @@ CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
 CONFIG_CHROMEOS_TBMC=m
 CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_EC_LPC=m
 CONFIG_CROS_EC_LPC_MEC=y
@@ -8059,6 +8347,7 @@ CONFIG_CROS_EC_LIGHTBAR=m
 CONFIG_CROS_EC_VBC=m
 CONFIG_CROS_EC_DEBUGFS=m
 CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_WILCO_EC=m
 CONFIG_WILCO_EC_DEBUGFS=m
 CONFIG_MELLANOX_PLATFORM=y
@@ -8085,11 +8374,14 @@ CONFIG_COMMON_CLK_CDCE925=m
 CONFIG_COMMON_CLK_CS2000_CP=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_CLK_TWL6040=m
+CONFIG_COMMON_CLK_LOCHNAGAR=m
 CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_VC5=m
 CONFIG_COMMON_CLK_BD718XX=m
 CONFIG_COMMON_CLK_FIXED_MMIO=y
+# end of Common Clock Framework
+
 CONFIG_HWSPINLOCK=y
 
 #
@@ -8098,6 +8390,8 @@ CONFIG_HWSPINLOCK=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
 CONFIG_MAILBOX=y
 CONFIG_PLATFORM_MHU=m
 CONFIG_PCC=y
@@ -8110,6 +8404,8 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # Generic IOMMU Pagetable Support
 #
+# end of Generic IOMMU Pagetable Support
+
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
@@ -8127,6 +8423,7 @@ CONFIG_HYPERV_IOMMU=y
 # Remoteproc drivers
 #
 # CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
 
 #
 # Rpmsg drivers
@@ -8136,6 +8433,8 @@ CONFIG_RPMSG_CHAR=m
 CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
 CONFIG_RPMSG_QCOM_GLINK_RPM=m
 CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
 CONFIG_SOUNDWIRE=y
 
 #
@@ -8152,28 +8451,49 @@ CONFIG_SOUNDWIRE_INTEL=m
 #
 # Amlogic SoC drivers
 #
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
 
 #
 # Broadcom SoC drivers
 #
+# end of Broadcom SoC drivers
 
 #
 # NXP/Freescale QorIQ SoC drivers
 #
+# end of NXP/Freescale QorIQ SoC drivers
 
 #
 # i.MX SoC drivers
 #
+# end of i.MX SoC drivers
+
+#
+# IXP4xx SoC drivers
+#
+CONFIG_IXP4XX_QMGR=m
+CONFIG_IXP4XX_NPE=m
+# end of IXP4xx SoC drivers
 
 #
 # Qualcomm SoC drivers
 #
+# end of Qualcomm SoC drivers
+
 CONFIG_SOC_TI=y
 
 #
 # Xilinx SoC drivers
 #
 CONFIG_XILINX_VCU=m
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -8266,6 +8586,7 @@ CONFIG_MXC6255=m
 CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
+# end of Accelerometers
 
 #
 # Analog to digital converters
@@ -8281,6 +8602,7 @@ CONFIG_AD7606_IFACE_PARALLEL=m
 CONFIG_AD7606_IFACE_SPI=m
 CONFIG_AD7766=m
 CONFIG_AD7768_1=m
+CONFIG_AD7780=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
@@ -8327,6 +8649,7 @@ CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
 CONFIG_TI_ADS7950=m
+CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_ADS124S08=m
 CONFIG_TI_AM335X_ADC=m
@@ -8335,16 +8658,19 @@ CONFIG_TWL4030_MADC=m
 CONFIG_TWL6030_GPADC=m
 CONFIG_VF610_ADC=m
 CONFIG_VIPERBOARD_ADC=m
+# end of Analog to digital converters
 
 #
 # Analog Front Ends
 #
 CONFIG_IIO_RESCALE=m
+# end of Analog Front Ends
 
 #
 # Amplifiers
 #
 CONFIG_AD8366=m
+# end of Amplifiers
 
 #
 # Chemical Sensors
@@ -8359,6 +8685,8 @@ CONFIG_PMS7003=m
 CONFIG_SENSIRION_SGP30=m
 CONFIG_SPS30=m
 CONFIG_VZ89X=m
+# end of Chemical Sensors
+
 CONFIG_IIO_CROS_EC_SENSORS_CORE=m
 CONFIG_IIO_CROS_EC_SENSORS=m
 
@@ -8367,6 +8695,8 @@ CONFIG_IIO_CROS_EC_SENSORS=m
 #
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
 CONFIG_IIO_MS_SENSORS_I2C=m
 
 #
@@ -8374,15 +8704,13 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 #
 CONFIG_IIO_SSP_SENSORS_COMMONS=m
 CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
 CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
 #
-# Counters
-#
-
-#
 # Digital to analog converters
 #
 CONFIG_AD5064=m
@@ -8420,11 +8748,13 @@ CONFIG_TI_DAC5571=m
 CONFIG_TI_DAC7311=m
 CONFIG_TI_DAC7612=m
 CONFIG_VF610_DAC=m
+# end of Digital to analog converters
 
 #
 # IIO dummy driver
 #
 # CONFIG_IIO_SIMPLE_DUMMY is not set
+# end of IIO dummy driver
 
 #
 # Frequency Synthesizers DDS/PLL
@@ -8434,11 +8764,14 @@ CONFIG_VF610_DAC=m
 # Clock Generator/Distribution
 #
 CONFIG_AD9523=m
+# end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
 CONFIG_ADF4350=m
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
 
 #
 # Digital gyroscope sensors
@@ -8451,6 +8784,9 @@ CONFIG_ADXRS450=m
 CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_MPU3050=m
 CONFIG_MPU3050_I2C=m
@@ -8458,6 +8794,7 @@ CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
 
 #
 # Health Sensors
@@ -8470,6 +8807,8 @@ CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
 
 #
 # Humidity sensors
@@ -8484,6 +8823,7 @@ CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
+# end of Humidity sensors
 
 #
 # Inertial measurement units
@@ -8500,6 +8840,8 @@ CONFIG_INV_MPU6050_SPI=m
 CONFIG_IIO_ST_LSM6DSX=m
 CONFIG_IIO_ST_LSM6DSX_I2C=m
 CONFIG_IIO_ST_LSM6DSX_SPI=m
+# end of Inertial measurement units
+
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -8552,6 +8894,7 @@ CONFIG_VCNL4035=m
 CONFIG_VEML6070=m
 CONFIG_VL6180=m
 CONFIG_ZOPT2201=m
+# end of Light sensors
 
 #
 # Magnetometer sensors
@@ -8574,17 +8917,20 @@ CONFIG_SENSORS_HMC5843_SPI=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
 
 #
 # Multiplexers
 #
 CONFIG_IIO_MUX=m
+# end of Multiplexers
 
 #
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
 
 #
 # Triggers - standalone
@@ -8593,6 +8939,7 @@ CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
 
 #
 # Digital potentiometers
@@ -8606,11 +8953,13 @@ CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_MCP41010=m
 CONFIG_TPL0102=m
+# end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
 CONFIG_LMP91000=m
+# end of Digital potentiostats
 
 #
 # Pressure sensors
@@ -8638,28 +8987,33 @@ CONFIG_HP206C=m
 CONFIG_ZPA2326=m
 CONFIG_ZPA2326_I2C=m
 CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
 
 #
 # Lightning sensors
 #
 CONFIG_AS3935=m
+# end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
 CONFIG_ISL29501=m
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
 CONFIG_RFD77402=m
 CONFIG_SRF04=m
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
 CONFIG_AD2S90=m
 CONFIG_AD2S1200=m
+# end of Resolver to digital converters
 
 #
 # Temperature sensors
@@ -8672,6 +9026,9 @@ CONFIG_TMP006=m
 CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
 CONFIG_NTB=m
 CONFIG_NTB_AMD=m
 CONFIG_NTB_IDT=m
@@ -8720,6 +9077,8 @@ CONFIG_PWM_TWL_LED=m
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
@@ -8750,6 +9109,8 @@ CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_SAMSUNG_USB2=m
 CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
 CONFIG_POWERCAP=y
 CONFIG_INTEL_RAPL=m
 CONFIG_IDLE_INJECT=y
@@ -8760,6 +9121,8 @@ CONFIG_MCB_LPC=m
 #
 # Performance monitor support
 #
+# end of Performance monitor support
+
 CONFIG_RAS=y
 CONFIG_RAS_CEC=y
 CONFIG_THUNDERBOLT=m
@@ -8768,6 +9131,8 @@ CONFIG_THUNDERBOLT=m
 # Android
 #
 # CONFIG_ANDROID is not set
+# end of Android
+
 CONFIG_LIBNVDIMM=y
 CONFIG_BLK_DEV_PMEM=m
 CONFIG_ND_BLK=m
@@ -8785,6 +9150,7 @@ CONFIG_DEV_DAX_PMEM=m
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX_PMEM_COMPAT=m
 CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
 CONFIG_RAVE_SP_EEPROM=m
 
 #
@@ -8805,6 +9171,8 @@ CONFIG_INTEL_TH_STH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
 # CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
 CONFIG_FPGA=m
 CONFIG_ALTERA_PR_IP_CORE=m
 CONFIG_ALTERA_PR_IP_CORE_PLAT=m
@@ -8841,13 +9209,18 @@ CONFIG_MUX_ADG792A=m
 CONFIG_MUX_ADGS1408=m
 CONFIG_MUX_GPIO=m
 CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
 CONFIG_PM_OPP=y
-# CONFIG_UNISYS_VISORBUS is not set
+CONFIG_UNISYS_VISORBUS=m
 CONFIG_SIOX=m
 CONFIG_SIOX_BUS_GPIO=m
 CONFIG_SLIMBUS=m
 CONFIG_SLIM_QCOM_CTRL=m
 CONFIG_INTERCONNECT=m
+CONFIG_COUNTER=m
+CONFIG_FTM_QUADDEC=m
+# end of Device Drivers
 
 #
 # File systems
@@ -8952,6 +9325,7 @@ CONFIG_FSCACHE_HISTOGRAM=y
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
 
 #
 # CD-ROM/DVD Filesystems
@@ -8960,6 +9334,7 @@ CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
 
 #
 # DOS/FAT/NT Filesystems
@@ -8973,6 +9348,7 @@ CONFIG_FAT_DEFAULT_UTF8=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 CONFIG_NTFS_RW=y
+# end of DOS/FAT/NT Filesystems
 
 #
 # Pseudo filesystems
@@ -8995,6 +9371,8 @@ CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 # CONFIG_ADFS_FS is not set
@@ -9199,6 +9577,9 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
 
 #
 # Security options
@@ -9242,6 +9623,7 @@ CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
 CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
@@ -9256,6 +9638,25 @@ CONFIG_SECURITY_SAFESETID=y
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="yama"
+
+#
+# Kernel hardening options
+#
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+
+#
+# Memory initialization
+#
+# CONFIG_INIT_STACK_NONE is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -9283,9 +9684,6 @@ CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
 CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -9303,6 +9701,15 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=m
 CONFIG_CRYPTO_ENGINE=m
 
 #
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
+#
 # Authenticated Encryption with Associated Data
 #
 CONFIG_CRYPTO_CCM=m
@@ -9493,6 +9900,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 CONFIG_SECONDARY_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
+# end of Certificates for signature checking
+
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -9500,12 +9909,14 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
 CONFIG_BITREVERSE=y
-CONFIG_RATIONAL=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -9559,7 +9970,6 @@ CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -9588,7 +9998,6 @@ CONFIG_GLOB=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
 CONFIG_DDR=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
@@ -9614,9 +10023,12 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
+CONFIG_ARCH_STACKWALK=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
 # CONFIG_STRING_SELFTEST is not set
+# end of Library routines
+
 CONFIG_OBJAGG=m
 
 #
@@ -9633,6 +10045,7 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=1
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
 
 #
 # Compile-time checks and compiler options
@@ -9645,14 +10058,18 @@ CONFIG_STRIP_ASM_SYMS=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_STACK_VALIDATION=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Memory Debugging
@@ -9674,12 +10091,12 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 # CONFIG_KASAN is not set
 CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -9702,6 +10119,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
@@ -9728,12 +10147,14 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PI_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
@@ -9746,6 +10167,8 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -9808,7 +10231,6 @@ CONFIG_HIST_TRIGGERS=y
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_LKDTM=m
@@ -9823,6 +10245,7 @@ CONFIG_LKDTM=m
 # CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
@@ -9883,7 +10306,6 @@ CONFIG_IO_DELAY_0X80=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 CONFIG_DEBUG_BOOT_PARAMS=y
 # CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
 # CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 # CONFIG_X86_DEBUG_FPU is not set
@@ -9891,3 +10313,4 @@ CONFIG_DEBUG_BOOT_PARAMS=y
 CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
 # CONFIG_UNWINDER_GUESS is not set
+# end of Kernel hacking