updpkg: libre/linux-libre 6.3.3-1

Signed-off-by: David P <megver83@parabola.nu>

15 files changed, 1741 insertions, 3547 deletions

diff --git a/libre/linux-libre/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/libre/linux-libre/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
index a6967e024..d4c3cf0ee 100644
--- a/libre/linux-libre/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/libre/linux-libre/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -1,4 +1,4 @@
-From cf30569da906ee631341244693ab1affde38809d Mon Sep 17 00:00:00 2001
+From 4533007cef1bd1da546752b372234b9bb9548214 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
 Subject: [PATCH 1/7] ARM: atags: add support for Marvell's u-boot
@@ -47,5 +47,5 @@ index 25ceda63b284..83578c54975b 100644
  };
  
 -- 
-2.35.1
+2.37.0
 
diff --git a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index 669d7c0b6..ce00410c3 100644
--- a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From c6b820ca21a933239b7929851c50aa40f515781d Mon Sep 17 00:00:00 2001
+From 59f2f4ec4f5168b6c8945d59b9859d8b2321882b Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged
  CLONE_NEWUSER
 
 Our default behavior continues to match the vanilla kernel.
@@ -36,10 +36,10 @@ index 45f09bec02c4..87b20e2ee274 100644
  {
  	return &init_user_ns;
 diff --git a/init/Kconfig b/init/Kconfig
-index 94125d3b6893..9f7139b536f6 100644
+index c88bb30a8b0b..32ba96d94028 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1247,6 +1247,22 @@ config USER_NS
+@@ -1249,6 +1249,22 @@ config USER_NS
  
  	  If unsure, say N.
  
@@ -63,12 +63,12 @@ index 94125d3b6893..9f7139b536f6 100644
  	bool "PID Namespaces"
  	default y
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 844dfdc8c639..31d41db3f84d 100644
+index ea332319dffe..349945168239 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 @@ -98,6 +98,10 @@
- #include <linux/io_uring.h>
  #include <linux/bpf.h>
+ #include <linux/stackprotector.h>
  
 +#ifdef CONFIG_USER_NS
 +#include <linux/user_namespace.h>
@@ -77,7 +77,7 @@ index 844dfdc8c639..31d41db3f84d 100644
  #include <asm/pgalloc.h>
  #include <linux/uaccess.h>
  #include <asm/mmu_context.h>
-@@ -2011,6 +2015,10 @@ static __latent_entropy struct task_struct *copy_process(
+@@ -2032,6 +2036,10 @@ static __latent_entropy struct task_struct *copy_process(
  	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
  		return ERR_PTR(-EINVAL);
  
@@ -88,7 +88,7 @@ index 844dfdc8c639..31d41db3f84d 100644
  	/*
  	 * Thread groups must share signals as well, and detached threads
  	 * can only be started up within the thread group.
-@@ -3171,6 +3179,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -3182,6 +3190,12 @@ int ksys_unshare(unsigned long unshare_flags)
  	if (unshare_flags & CLONE_NEWNS)
  		unshare_flags |= CLONE_FS;
  
@@ -102,7 +102,7 @@ index 844dfdc8c639..31d41db3f84d 100644
  	if (err)
  		goto bad_unshare_out;
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index c6d9dec11b74..9a4514ad481b 100644
+index 1c240d2c99bc..2971581a27e2 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
 @@ -81,6 +81,9 @@
@@ -115,7 +115,7 @@ index c6d9dec11b74..9a4514ad481b 100644
  
  /* shared constants to be used in various sysctls */
  const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 };
-@@ -1659,6 +1662,15 @@ static struct ctl_table kern_table[] = {
+@@ -1645,6 +1648,15 @@ static struct ctl_table kern_table[] = {
  		.mode		= 0644,
  		.proc_handler	= proc_dointvec,
  	},
@@ -132,7 +132,7 @@ index c6d9dec11b74..9a4514ad481b 100644
  	{
  		.procname	= "tainted",
 diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 54211dbd516c..16ca0c151629 100644
+index 1d8e47bed3f1..fec01d016a35 100644
 --- a/kernel/user_namespace.c
 +++ b/kernel/user_namespace.c
 @@ -22,6 +22,13 @@
@@ -150,5 +150,5 @@ index 54211dbd516c..16ca0c151629 100644
  static DEFINE_MUTEX(userns_state_mutex);
  
 -- 
-2.39.0
+2.40.1
 
diff --git a/libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
index c8220871f..758c05046 100644
--- a/libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,4 +1,4 @@
-From 9f2269dc32ec1f583bba94432ca17dcef3778677 Mon Sep 17 00:00:00 2001
+From b2f96ec9b408c8bbec437c3d3b54c0b748fca85a Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
 Subject: [PATCH 2/7] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
@@ -34,5 +34,5 @@ index 1feb6b0f7a1f..5e5cb3094b6a 100644
  	}
  
 -- 
-2.35.1
+2.37.0
 
diff --git a/libre/linux-libre/0002-docs-Fix-the-docs-build-with-Sphinx-6.0.patch b/libre/linux-libre/0002-docs-Fix-the-docs-build-with-Sphinx-6.0.patch
deleted file mode 100644
index 270a6fe37..000000000
--- a/libre/linux-libre/0002-docs-Fix-the-docs-build-with-Sphinx-6.0.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 99c3052ddb60947d4590052bd68b4893967537eb Mon Sep 17 00:00:00 2001
-From: Jonathan Corbet <corbet@lwn.net>
-Date: Wed, 4 Jan 2023 13:45:35 -0700
-Subject: [PATCH 2/3] docs: Fix the docs build with Sphinx 6.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Sphinx 6.0 removed the execfile_() function, which we use as part of the
-configuration process.  They *did* warn us...  Just open-code the
-functionality as is done in Sphinx itself.
-
-Tested (using SPHINX_CONF, since this code is only executed with an
-alternative config file) on various Sphinx versions from 2.5 through 6.0.
-
-Reported-by: Martin Liška <mliska@suse.cz>
-Signed-off-by: Jonathan Corbet <corbet@lwn.net>
----
- Documentation/sphinx/load_config.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Documentation/sphinx/load_config.py b/Documentation/sphinx/load_config.py
-index eeb394b39e2c..8b416bfd75ac 100644
---- a/Documentation/sphinx/load_config.py
-+++ b/Documentation/sphinx/load_config.py
-@@ -3,7 +3,7 @@
- 
- import os
- import sys
--from sphinx.util.pycompat import execfile_
-+from sphinx.util.osutil import fs_encoding
- 
- # ------------------------------------------------------------------------------
- def loadConfig(namespace):
-@@ -48,7 +48,9 @@ def loadConfig(namespace):
-             sys.stdout.write("load additional sphinx-config: %s\n" % config_file)
-             config = namespace.copy()
-             config['__file__'] = config_file
--            execfile_(config_file, config)
-+            with open(config_file, 'rb') as f:
-+                code = compile(f.read(), fs_encoding, 'exec')
-+                exec(code, config)
-             del config['__file__']
-             namespace.update(config)
-         else:
--- 
-2.39.0
-
diff --git a/libre/linux-libre/0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch b/libre/linux-libre/0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch
new file mode 100644
index 000000000..73b1a4a81
--- /dev/null
+++ b/libre/linux-libre/0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch
@@ -0,0 +1,50 @@
+From 2fd9916a465e3b62452ac4346def013c3d8698a4 Mon Sep 17 00:00:00 2001
+From: Fangzhi Zuo <jerry.zuo@amd.com>
+Date: Wed, 17 May 2023 19:37:13 +0800
+Subject: [PATCH 2/2] drm/amd/display: Have Payload Properly Created After
+ Resume
+
+At drm suspend sequence, MST dc_sink is removed. When commit cached
+MST stream back in drm resume sequence, the MST stream payload is not
+properly created and added into the payload table. After resume, topology
+change is reprobed by removing existing streams first. That leads to
+no payload is found in the existing payload table as below error
+"[drm] ERROR No payload for [MST PORT:] found in mst state"
+
+1. In encoder .atomic_check routine, remove check existance of dc_sink
+2. Bypass MST by checking existence of MST root port. dc_link_type cannot
+differentiate MST port before topology is rediscovered.
+
+Reviewed-by: Wayne Lin <wayne.lin@amd.com>
+Acked-by: Tom Chung <chiahsuan.chung@amd.com>
+Signed-off-by: Fangzhi Zuo <jerry.zuo@amd.com>
+(cherry picked from https://patchwork.freedesktop.org/patch/537553/)
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index f54d670ab3ab..0695c7c3d489 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -2813,7 +2813,7 @@ static int dm_resume(void *handle)
+ 		 * this is the case when traversing through already created
+ 		 * MST connectors, should be skipped
+ 		 */
+-		if (aconnector->dc_link->type == dc_connection_mst_branch)
++		if (aconnector && aconnector->mst_root)
+ 			continue;
+ 
+ 		mutex_lock(&aconnector->hpd_lock);
+@@ -6717,7 +6717,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder,
+ 	int clock, bpp = 0;
+ 	bool is_y420 = false;
+ 
+-	if (!aconnector->mst_output_port || !aconnector->dc_sink)
++	if (!aconnector->mst_output_port)
+ 		return 0;
+ 
+ 	mst_port = aconnector->mst_output_port;
+-- 
+2.40.1
+
diff --git a/libre/linux-libre/0003-Revert-drm-display-dp_mst-Move-all-payload-info-into.patch b/libre/linux-libre/0003-Revert-drm-display-dp_mst-Move-all-payload-info-into.patch
deleted file mode 100644
index f2796669f..000000000
--- a/libre/linux-libre/0003-Revert-drm-display-dp_mst-Move-all-payload-info-into.patch
+++ /dev/null
@@ -1,2478 +0,0 @@
-From 7c4fed4d2afd27d7acb8835f8e79f49c99c03cdf Mon Sep 17 00:00:00 2001
-From: Wayne Lin <Wayne.Lin@amd.com>
-Date: Thu, 12 Jan 2023 16:50:44 +0800
-Subject: [PATCH 3/3] Revert "drm/display/dp_mst: Move all payload info into
- the atomic state"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 4d07b0bc403403438d9cf88450506240c5faf92f.
-
-[Why]
-Changes cause regression on amdgpu mst.
-E.g.
-In fill_dc_mst_payload_table_from_drm(), amdgpu expects to add/remove payload
-one by one and call fill_dc_mst_payload_table_from_drm() to update the HW
-maintained payload table. But previous change tries to go through all the
-payloads in mst_state and update amdpug hw maintained table in once everytime
-driver only tries to add/remove a specific payload stream only. The newly
-design idea conflicts with the implementation in amdgpu nowadays.
-
-[How]
-Revert this patch first. After addressing all regression problems caused by
-this previous patch, will add it back and adjust it.
-
-Signed-off-by: Wayne Lin <Wayne.Lin@amd.com>
-Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2171
-Cc: stable@vger.kernel.org # 6.1
-Cc: Lyude Paul <lyude@redhat.com>
-Cc: Harry Wentland <harry.wentland@amd.com>
-Cc: Mario Limonciello <mario.limonciello@amd.com>
-Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Cc: Ben Skeggs <bskeggs@redhat.com>
-Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
-Cc: Fangzhi Zuo <Jerry.Zuo@amd.com>
----
- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |  53 +-
- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 104 ++-
- .../display/amdgpu_dm/amdgpu_dm_mst_types.c   |  87 ++-
- .../amd/display/include/link_service_types.h  |   3 -
- drivers/gpu/drm/display/drm_dp_mst_topology.c | 724 ++++++++++++------
- drivers/gpu/drm/i915/display/intel_dp_mst.c   |  64 +-
- drivers/gpu/drm/i915/display/intel_hdcp.c     |  24 +-
- drivers/gpu/drm/nouveau/dispnv50/disp.c       | 169 ++--
- include/drm/display/drm_dp_mst_helper.h       | 178 +++--
- 9 files changed, 876 insertions(+), 530 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index dacad8b85963..40defd664b49 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -6460,7 +6460,6 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder,
- 	const struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;
- 	struct drm_dp_mst_topology_mgr *mst_mgr;
- 	struct drm_dp_mst_port *mst_port;
--	struct drm_dp_mst_topology_state *mst_state;
- 	enum dc_color_depth color_depth;
- 	int clock, bpp = 0;
- 	bool is_y420 = false;
-@@ -6474,13 +6473,6 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder,
- 	if (!crtc_state->connectors_changed && !crtc_state->mode_changed)
- 		return 0;
- 
--	mst_state = drm_atomic_get_mst_topology_state(state, mst_mgr);
--	if (IS_ERR(mst_state))
--		return PTR_ERR(mst_state);
--
--	if (!mst_state->pbn_div)
--		mst_state->pbn_div = dm_mst_get_pbn_divider(aconnector->mst_port->dc_link);
--
- 	if (!state->duplicated) {
- 		int max_bpc = conn_state->max_requested_bpc;
- 		is_y420 = drm_mode_is_420_also(&connector->display_info, adjusted_mode) &&
-@@ -6492,10 +6484,11 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder,
- 		clock = adjusted_mode->clock;
- 		dm_new_connector_state->pbn = drm_dp_calc_pbn_mode(clock, bpp, false);
- 	}
--
--	dm_new_connector_state->vcpi_slots =
--		drm_dp_atomic_find_time_slots(state, mst_mgr, mst_port,
--					      dm_new_connector_state->pbn);
-+	dm_new_connector_state->vcpi_slots = drm_dp_atomic_find_time_slots(state,
-+									   mst_mgr,
-+									   mst_port,
-+									   dm_new_connector_state->pbn,
-+									   dm_mst_get_pbn_divider(aconnector->dc_link));
- 	if (dm_new_connector_state->vcpi_slots < 0) {
- 		DRM_DEBUG_ATOMIC("failed finding vcpi slots: %d\n", (int)dm_new_connector_state->vcpi_slots);
- 		return dm_new_connector_state->vcpi_slots;
-@@ -6566,14 +6559,17 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state,
- 			dm_conn_state->vcpi_slots = slot_num;
- 
- 			ret = drm_dp_mst_atomic_enable_dsc(state, aconnector->port,
--							   dm_conn_state->pbn, false);
-+							   dm_conn_state->pbn, 0, false);
- 			if (ret < 0)
- 				return ret;
- 
- 			continue;
- 		}
- 
--		vcpi = drm_dp_mst_atomic_enable_dsc(state, aconnector->port, pbn, true);
-+		vcpi = drm_dp_mst_atomic_enable_dsc(state,
-+						    aconnector->port,
-+						    pbn, pbn_div,
-+						    true);
- 		if (vcpi < 0)
- 			return vcpi;
- 
-@@ -9407,6 +9403,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
- 	struct dm_crtc_state *dm_old_crtc_state, *dm_new_crtc_state;
- #if defined(CONFIG_DRM_AMD_DC_DCN)
- 	struct dsc_mst_fairness_vars vars[MAX_PIPES];
-+	struct drm_dp_mst_topology_state *mst_state;
-+	struct drm_dp_mst_topology_mgr *mgr;
- #endif
- 
- 	trace_amdgpu_dm_atomic_check_begin(state);
-@@ -9654,6 +9652,33 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
- 		lock_and_validation_needed = true;
- 	}
- 
-+#if defined(CONFIG_DRM_AMD_DC_DCN)
-+	/* set the slot info for each mst_state based on the link encoding format */
-+	for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) {
-+		struct amdgpu_dm_connector *aconnector;
-+		struct drm_connector *connector;
-+		struct drm_connector_list_iter iter;
-+		u8 link_coding_cap;
-+
-+		if (!mgr->mst_state )
-+			continue;
-+
-+		drm_connector_list_iter_begin(dev, &iter);
-+		drm_for_each_connector_iter(connector, &iter) {
-+			int id = connector->index;
-+
-+			if (id == mst_state->mgr->conn_base_id) {
-+				aconnector = to_amdgpu_dm_connector(connector);
-+				link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link);
-+				drm_dp_mst_update_slots(mst_state, link_coding_cap);
-+
-+				break;
-+			}
-+		}
-+		drm_connector_list_iter_end(&iter);
-+
-+	}
-+#endif
- 	/**
- 	 * Streams and planes are reset when there are changes that affect
- 	 * bandwidth. Anything that affects bandwidth needs to go through
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-index f72c013d3a5b..c8f9d10fde17 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-@@ -27,7 +27,6 @@
- #include <linux/acpi.h>
- #include <linux/i2c.h>
- 
--#include <drm/drm_atomic.h>
- #include <drm/drm_probe_helper.h>
- #include <drm/amdgpu_drm.h>
- #include <drm/drm_edid.h>
-@@ -120,27 +119,40 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
- }
- 
- static void
--fill_dc_mst_payload_table_from_drm(struct drm_dp_mst_topology_state *mst_state,
--				   struct amdgpu_dm_connector *aconnector,
--				   struct dc_dp_mst_stream_allocation_table *table)
-+fill_dc_mst_payload_table_from_drm(struct amdgpu_dm_connector *aconnector,
-+				   struct dc_dp_mst_stream_allocation_table *proposed_table)
- {
--	struct dc_dp_mst_stream_allocation_table new_table = { 0 };
--	struct dc_dp_mst_stream_allocation *sa;
--	struct drm_dp_mst_atomic_payload *payload;
--
--	/* Fill payload info*/
--	list_for_each_entry(payload, &mst_state->payloads, next) {
--		if (payload->delete)
--			continue;
--
--		sa = &new_table.stream_allocations[new_table.stream_count];
--		sa->slot_count = payload->time_slots;
--		sa->vcp_id = payload->vcpi;
--		new_table.stream_count++;
-+	int i;
-+	struct drm_dp_mst_topology_mgr *mst_mgr =
-+			&aconnector->mst_port->mst_mgr;
-+
-+	mutex_lock(&mst_mgr->payload_lock);
-+
-+	proposed_table->stream_count = 0;
-+
-+	/* number of active streams */
-+	for (i = 0; i < mst_mgr->max_payloads; i++) {
-+		if (mst_mgr->payloads[i].num_slots == 0)
-+			break; /* end of vcp_id table */
-+
-+		ASSERT(mst_mgr->payloads[i].payload_state !=
-+				DP_PAYLOAD_DELETE_LOCAL);
-+
-+		if (mst_mgr->payloads[i].payload_state == DP_PAYLOAD_LOCAL ||
-+			mst_mgr->payloads[i].payload_state ==
-+					DP_PAYLOAD_REMOTE) {
-+
-+			struct dc_dp_mst_stream_allocation *sa =
-+					&proposed_table->stream_allocations[
-+						proposed_table->stream_count];
-+
-+			sa->slot_count = mst_mgr->payloads[i].num_slots;
-+			sa->vcp_id = mst_mgr->proposed_vcpis[i]->vcpi;
-+			proposed_table->stream_count++;
-+		}
- 	}
- 
--	/* Overwrite the old table */
--	*table = new_table;
-+	mutex_unlock(&mst_mgr->payload_lock);
- }
- 
- void dm_helpers_dp_update_branch_info(
-@@ -158,9 +170,11 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
- 		bool enable)
- {
- 	struct amdgpu_dm_connector *aconnector;
--	struct drm_dp_mst_topology_state *mst_state;
--	struct drm_dp_mst_atomic_payload *payload;
-+	struct dm_connector_state *dm_conn_state;
- 	struct drm_dp_mst_topology_mgr *mst_mgr;
-+	struct drm_dp_mst_port *mst_port;
-+	bool ret;
-+	u8 link_coding_cap = DP_8b_10b_ENCODING;
- 
- 	aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context;
- 	/* Accessing the connector state is required for vcpi_slots allocation
-@@ -171,21 +185,40 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
- 	if (!aconnector || !aconnector->mst_port)
- 		return false;
- 
-+	dm_conn_state = to_dm_connector_state(aconnector->base.state);
-+
- 	mst_mgr = &aconnector->mst_port->mst_mgr;
--	mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
-+
-+	if (!mst_mgr->mst_state)
-+		return false;
-+
-+	mst_port = aconnector->port;
-+
-+#if defined(CONFIG_DRM_AMD_DC_DCN)
-+	link_coding_cap = dc_link_dp_mst_decide_link_encoding_format(aconnector->dc_link);
-+#endif
-+
-+	if (enable) {
-+
-+		ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port,
-+					       dm_conn_state->pbn,
-+					       dm_conn_state->vcpi_slots);
-+		if (!ret)
-+			return false;
-+
-+	} else {
-+		drm_dp_mst_reset_vcpi_slots(mst_mgr, mst_port);
-+	}
- 
- 	/* It's OK for this to fail */
--	payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->port);
--	if (enable)
--		drm_dp_add_payload_part1(mst_mgr, mst_state, payload);
--	else
--		drm_dp_remove_payload(mst_mgr, mst_state, payload);
-+	drm_dp_update_payload_part1(mst_mgr, (link_coding_cap == DP_CAP_ANSI_128B132B) ? 0:1);
- 
- 	/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or
- 	 * AUX message. The sequence is slot 1-63 allocated sequence for each
- 	 * stream. AMD ASIC stream slot allocation should follow the same
- 	 * sequence. copy DRM MST allocation to dc */
--	fill_dc_mst_payload_table_from_drm(mst_state, aconnector, proposed_table);
-+
-+	fill_dc_mst_payload_table_from_drm(aconnector, proposed_table);
- 
- 	return true;
- }
-@@ -242,9 +275,8 @@ bool dm_helpers_dp_mst_send_payload_allocation(
- 		bool enable)
- {
- 	struct amdgpu_dm_connector *aconnector;
--	struct drm_dp_mst_topology_state *mst_state;
- 	struct drm_dp_mst_topology_mgr *mst_mgr;
--	struct drm_dp_mst_atomic_payload *payload;
-+	struct drm_dp_mst_port *mst_port;
- 	enum mst_progress_status set_flag = MST_ALLOCATE_NEW_PAYLOAD;
- 	enum mst_progress_status clr_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
- 
-@@ -253,16 +285,19 @@ bool dm_helpers_dp_mst_send_payload_allocation(
- 	if (!aconnector || !aconnector->mst_port)
- 		return false;
- 
-+	mst_port = aconnector->port;
-+
- 	mst_mgr = &aconnector->mst_port->mst_mgr;
--	mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
- 
--	payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->port);
-+	if (!mst_mgr->mst_state)
-+		return false;
-+
- 	if (!enable) {
- 		set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
- 		clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
- 	}
- 
--	if (enable && drm_dp_add_payload_part2(mst_mgr, mst_state->base.state, payload)) {
-+	if (drm_dp_update_payload_part2(mst_mgr)) {
- 		amdgpu_dm_set_mst_status(&aconnector->mst_status,
- 			set_flag, false);
- 	} else {
-@@ -272,6 +307,9 @@ bool dm_helpers_dp_mst_send_payload_allocation(
- 			clr_flag, false);
- 	}
- 
-+	if (!enable)
-+		drm_dp_mst_deallocate_vcpi(mst_mgr, mst_port);
-+
- 	return true;
- }
- 
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
-index 6483ba266893..d57f1528a295 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
-@@ -598,8 +598,15 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
- 
- 	dc_link_dp_get_max_link_enc_cap(aconnector->dc_link, &max_link_enc_cap);
- 	aconnector->mst_mgr.cbs = &dm_mst_cbs;
--	drm_dp_mst_topology_mgr_init(&aconnector->mst_mgr, adev_to_drm(dm->adev),
--				     &aconnector->dm_dp_aux.aux, 16, 4, aconnector->connector_id);
-+	drm_dp_mst_topology_mgr_init(
-+		&aconnector->mst_mgr,
-+		adev_to_drm(dm->adev),
-+		&aconnector->dm_dp_aux.aux,
-+		16,
-+		4,
-+		max_link_enc_cap.lane_count,
-+		drm_dp_bw_code_to_link_rate(max_link_enc_cap.link_rate),
-+		aconnector->connector_id);
- 
- 	drm_connector_attach_dp_subconnector_property(&aconnector->base);
- }
-@@ -703,13 +710,12 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn)
- 	return dsc_config.bits_per_pixel;
- }
- 
--static int increase_dsc_bpp(struct drm_atomic_state *state,
--			    struct drm_dp_mst_topology_state *mst_state,
--			    struct dc_link *dc_link,
--			    struct dsc_mst_fairness_params *params,
--			    struct dsc_mst_fairness_vars *vars,
--			    int count,
--			    int k)
-+static bool increase_dsc_bpp(struct drm_atomic_state *state,
-+			     struct dc_link *dc_link,
-+			     struct dsc_mst_fairness_params *params,
-+			     struct dsc_mst_fairness_vars *vars,
-+			     int count,
-+			     int k)
- {
- 	int i;
- 	bool bpp_increased[MAX_PIPES];
-@@ -717,10 +723,13 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
- 	int min_initial_slack;
- 	int next_index;
- 	int remaining_to_increase = 0;
-+	int pbn_per_timeslot;
- 	int link_timeslots_used;
- 	int fair_pbn_alloc;
- 	int ret = 0;
- 
-+	pbn_per_timeslot = dm_mst_get_pbn_divider(dc_link);
-+
- 	for (i = 0; i < count; i++) {
- 		if (vars[i + k].dsc_enabled) {
- 			initial_slack[i] =
-@@ -751,17 +760,18 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
- 		link_timeslots_used = 0;
- 
- 		for (i = 0; i < count; i++)
--			link_timeslots_used += DIV_ROUND_UP(vars[i + k].pbn, mst_state->pbn_div);
-+			link_timeslots_used += DIV_ROUND_UP(vars[i + k].pbn, pbn_per_timeslot);
- 
--		fair_pbn_alloc =
--			(63 - link_timeslots_used) / remaining_to_increase * mst_state->pbn_div;
-+		fair_pbn_alloc = (63 - link_timeslots_used) / remaining_to_increase * pbn_per_timeslot;
- 
- 		if (initial_slack[next_index] > fair_pbn_alloc) {
- 			vars[next_index].pbn += fair_pbn_alloc;
-+
- 			ret = drm_dp_atomic_find_time_slots(state,
- 							    params[next_index].port->mgr,
- 							    params[next_index].port,
--							    vars[next_index].pbn);
-+							    vars[next_index].pbn,
-+							    pbn_per_timeslot);
- 			if (ret < 0)
- 				return ret;
- 
-@@ -773,7 +783,8 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
- 				ret = drm_dp_atomic_find_time_slots(state,
- 								    params[next_index].port->mgr,
- 								    params[next_index].port,
--								    vars[next_index].pbn);
-+								    vars[next_index].pbn,
-+								    pbn_per_timeslot);
- 				if (ret < 0)
- 					return ret;
- 			}
-@@ -782,7 +793,8 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
- 			ret = drm_dp_atomic_find_time_slots(state,
- 							    params[next_index].port->mgr,
- 							    params[next_index].port,
--							    vars[next_index].pbn);
-+							    vars[next_index].pbn,
-+							    pbn_per_timeslot);
- 			if (ret < 0)
- 				return ret;
- 
-@@ -794,7 +806,8 @@ static int increase_dsc_bpp(struct drm_atomic_state *state,
- 				ret = drm_dp_atomic_find_time_slots(state,
- 								    params[next_index].port->mgr,
- 								    params[next_index].port,
--								    vars[next_index].pbn);
-+								    vars[next_index].pbn,
-+								    pbn_per_timeslot);
- 				if (ret < 0)
- 					return ret;
- 			}
-@@ -850,10 +863,12 @@ static int try_disable_dsc(struct drm_atomic_state *state,
- 			break;
- 
- 		vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps);
-+
- 		ret = drm_dp_atomic_find_time_slots(state,
- 						    params[next_index].port->mgr,
- 						    params[next_index].port,
--						    vars[next_index].pbn);
-+						    vars[next_index].pbn,
-+						    dm_mst_get_pbn_divider(dc_link));
- 		if (ret < 0)
- 			return ret;
- 
-@@ -863,10 +878,12 @@ static int try_disable_dsc(struct drm_atomic_state *state,
- 			vars[next_index].bpp_x16 = 0;
- 		} else {
- 			vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.max_kbps);
-+
- 			ret = drm_dp_atomic_find_time_slots(state,
- 							    params[next_index].port->mgr,
- 							    params[next_index].port,
--							    vars[next_index].pbn);
-+							    vars[next_index].pbn,
-+							    dm_mst_get_pbn_divider(dc_link));
- 			if (ret < 0)
- 				return ret;
- 		}
-@@ -877,31 +894,21 @@ static int try_disable_dsc(struct drm_atomic_state *state,
- 	return 0;
- }
- 
--static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
--					    struct dc_state *dc_state,
--					    struct dc_link *dc_link,
--					    struct dsc_mst_fairness_vars *vars,
--					    struct drm_dp_mst_topology_mgr *mgr,
--					    int *link_vars_start_index)
-+static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
-+					     struct dc_state *dc_state,
-+					     struct dc_link *dc_link,
-+					     struct dsc_mst_fairness_vars *vars,
-+					     int *link_vars_start_index)
- {
-+	int i, k, ret;
- 	struct dc_stream_state *stream;
- 	struct dsc_mst_fairness_params params[MAX_PIPES];
- 	struct amdgpu_dm_connector *aconnector;
--	struct drm_dp_mst_topology_state *mst_state = drm_atomic_get_mst_topology_state(state, mgr);
- 	int count = 0;
--	int i, k, ret;
- 	bool debugfs_overwrite = false;
- 
- 	memset(params, 0, sizeof(params));
- 
--	if (IS_ERR(mst_state))
--		return PTR_ERR(mst_state);
--
--	mst_state->pbn_div = dm_mst_get_pbn_divider(dc_link);
--#if defined(CONFIG_DRM_AMD_DC_DCN)
--	drm_dp_mst_update_slots(mst_state, dc_link_dp_mst_decide_link_encoding_format(dc_link));
--#endif
--
- 	/* Set up params */
- 	for (i = 0; i < dc_state->stream_count; i++) {
- 		struct dc_dsc_policy dsc_policy = {0};
-@@ -961,7 +968,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
- 		vars[i + k].dsc_enabled = false;
- 		vars[i + k].bpp_x16 = 0;
- 		ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr, params[i].port,
--						    vars[i + k].pbn);
-+						    vars[i + k].pbn, dm_mst_get_pbn_divider(dc_link));
- 		if (ret < 0)
- 			return ret;
- 	}
-@@ -980,7 +987,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
- 			vars[i + k].dsc_enabled = true;
- 			vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16;
- 			ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
--							    params[i].port, vars[i + k].pbn);
-+							    params[i].port, vars[i + k].pbn, dm_mst_get_pbn_divider(dc_link));
- 			if (ret < 0)
- 				return ret;
- 		} else {
-@@ -988,7 +995,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
- 			vars[i + k].dsc_enabled = false;
- 			vars[i + k].bpp_x16 = 0;
- 			ret = drm_dp_atomic_find_time_slots(state, params[i].port->mgr,
--							    params[i].port, vars[i + k].pbn);
-+							    params[i].port, vars[i + k].pbn, dm_mst_get_pbn_divider(dc_link));
- 			if (ret < 0)
- 				return ret;
- 		}
-@@ -998,7 +1005,7 @@ static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,
- 		return ret;
- 
- 	/* Optimize degree of compression */
--	ret = increase_dsc_bpp(state, mst_state, dc_link, params, vars, count, k);
-+	ret = increase_dsc_bpp(state, dc_link, params, vars, count, k);
- 	if (ret < 0)
- 		return ret;
- 
-@@ -1148,7 +1155,7 @@ int compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,
- 			continue;
- 
- 		mst_mgr = aconnector->port->mgr;
--		ret = compute_mst_dsc_configs_for_link(state, dc_state, stream->link, vars, mst_mgr,
-+		ret = compute_mst_dsc_configs_for_link(state, dc_state, stream->link, vars,
- 						       &link_vars_start_index);
- 		if (ret != 0)
- 			return ret;
-@@ -1206,7 +1213,7 @@ static int pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,
- 			continue;
- 
- 		mst_mgr = aconnector->port->mgr;
--		ret = compute_mst_dsc_configs_for_link(state, dc_state, stream->link, vars, mst_mgr,
-+		ret = compute_mst_dsc_configs_for_link(state, dc_state, stream->link, vars,
- 						       &link_vars_start_index);
- 		if (ret != 0)
- 			return ret;
-diff --git a/drivers/gpu/drm/amd/display/include/link_service_types.h b/drivers/gpu/drm/amd/display/include/link_service_types.h
-index d1e91d31d151..0889c2a86733 100644
---- a/drivers/gpu/drm/amd/display/include/link_service_types.h
-+++ b/drivers/gpu/drm/amd/display/include/link_service_types.h
-@@ -252,9 +252,6 @@ union dpcd_training_lane_set {
-  * _ONLY_ be filled out from DM and then passed to DC, do NOT use these for _any_ kind of atomic
-  * state calculations in DM, or you will break something.
-  */
--
--struct drm_dp_mst_port;
--
- /* DP MST stream allocation (payload bandwidth number) */
- struct dc_dp_mst_stream_allocation {
- 	uint8_t vcp_id;
-diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
-index 51a46689cda7..95ff57d20216 100644
---- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
-+++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
-@@ -68,7 +68,8 @@ static bool dump_dp_payload_table(struct drm_dp_mst_topology_mgr *mgr,
- static void drm_dp_mst_topology_put_port(struct drm_dp_mst_port *port);
- 
- static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr,
--				     int id, u8 start_slot, u8 num_slots);
-+				     int id,
-+				     struct drm_dp_payload *payload);
- 
- static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr,
- 				 struct drm_dp_mst_port *port,
-@@ -1234,6 +1235,57 @@ build_query_stream_enc_status(struct drm_dp_sideband_msg_tx *msg, u8 stream_id,
- 	return 0;
- }
- 
-+static int drm_dp_mst_assign_payload_id(struct drm_dp_mst_topology_mgr *mgr,
-+					struct drm_dp_vcpi *vcpi)
-+{
-+	int ret, vcpi_ret;
-+
-+	mutex_lock(&mgr->payload_lock);
-+	ret = find_first_zero_bit(&mgr->payload_mask, mgr->max_payloads + 1);
-+	if (ret > mgr->max_payloads) {
-+		ret = -EINVAL;
-+		drm_dbg_kms(mgr->dev, "out of payload ids %d\n", ret);
-+		goto out_unlock;
-+	}
-+
-+	vcpi_ret = find_first_zero_bit(&mgr->vcpi_mask, mgr->max_payloads + 1);
-+	if (vcpi_ret > mgr->max_payloads) {
-+		ret = -EINVAL;
-+		drm_dbg_kms(mgr->dev, "out of vcpi ids %d\n", ret);
-+		goto out_unlock;
-+	}
-+
-+	set_bit(ret, &mgr->payload_mask);
-+	set_bit(vcpi_ret, &mgr->vcpi_mask);
-+	vcpi->vcpi = vcpi_ret + 1;
-+	mgr->proposed_vcpis[ret - 1] = vcpi;
-+out_unlock:
-+	mutex_unlock(&mgr->payload_lock);
-+	return ret;
-+}
-+
-+static void drm_dp_mst_put_payload_id(struct drm_dp_mst_topology_mgr *mgr,
-+				      int vcpi)
-+{
-+	int i;
-+
-+	if (vcpi == 0)
-+		return;
-+
-+	mutex_lock(&mgr->payload_lock);
-+	drm_dbg_kms(mgr->dev, "putting payload %d\n", vcpi);
-+	clear_bit(vcpi - 1, &mgr->vcpi_mask);
-+
-+	for (i = 0; i < mgr->max_payloads; i++) {
-+		if (mgr->proposed_vcpis[i] &&
-+		    mgr->proposed_vcpis[i]->vcpi == vcpi) {
-+			mgr->proposed_vcpis[i] = NULL;
-+			clear_bit(i + 1, &mgr->payload_mask);
-+		}
-+	}
-+	mutex_unlock(&mgr->payload_lock);
-+}
-+
- static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr,
- 			      struct drm_dp_sideband_msg_tx *txmsg)
- {
-@@ -1686,7 +1738,7 @@ drm_dp_mst_dump_port_topology_history(struct drm_dp_mst_port *port) {}
- #define save_port_topology_ref(port, type)
- #endif
- 
--struct drm_dp_mst_atomic_payload *
-+static struct drm_dp_mst_atomic_payload *
- drm_atomic_get_mst_payload_state(struct drm_dp_mst_topology_state *state,
- 				 struct drm_dp_mst_port *port)
- {
-@@ -1698,7 +1750,6 @@ drm_atomic_get_mst_payload_state(struct drm_dp_mst_topology_state *state,
- 
- 	return NULL;
- }
--EXPORT_SYMBOL(drm_atomic_get_mst_payload_state);
- 
- static void drm_dp_destroy_mst_branch_device(struct kref *kref)
- {
-@@ -3201,8 +3252,6 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,
- 		struct drm_dp_mst_port *port,
- 		struct drm_dp_query_stream_enc_status_ack_reply *status)
- {
--	struct drm_dp_mst_topology_state *state;
--	struct drm_dp_mst_atomic_payload *payload;
- 	struct drm_dp_sideband_msg_tx *txmsg;
- 	u8 nonce[7];
- 	int ret;
-@@ -3219,10 +3268,6 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,
- 
- 	get_random_bytes(nonce, sizeof(nonce));
- 
--	drm_modeset_lock(&mgr->base.lock, NULL);
--	state = to_drm_dp_mst_topology_state(mgr->base.state);
--	payload = drm_atomic_get_mst_payload_state(state, port);
--
- 	/*
- 	 * "Source device targets the QUERY_STREAM_ENCRYPTION_STATUS message
- 	 *  transaction at the MST Branch device directly connected to the
-@@ -3230,7 +3275,7 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,
- 	 */
- 	txmsg->dst = mgr->mst_primary;
- 
--	build_query_stream_enc_status(txmsg, payload->vcpi, nonce);
-+	build_query_stream_enc_status(txmsg, port->vcpi.vcpi, nonce);
- 
- 	drm_dp_queue_down_tx(mgr, txmsg);
- 
-@@ -3247,7 +3292,6 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,
- 	memcpy(status, &txmsg->reply.u.enc_status, sizeof(*status));
- 
- out:
--	drm_modeset_unlock(&mgr->base.lock);
- 	drm_dp_mst_topology_put_port(port);
- out_get_port:
- 	kfree(txmsg);
-@@ -3256,162 +3300,238 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,
- EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status);
- 
- static int drm_dp_create_payload_step1(struct drm_dp_mst_topology_mgr *mgr,
--				       struct drm_dp_mst_atomic_payload *payload)
-+				       int id,
-+				       struct drm_dp_payload *payload)
- {
--	return drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload->vc_start_slot,
--					 payload->time_slots);
-+	int ret;
-+
-+	ret = drm_dp_dpcd_write_payload(mgr, id, payload);
-+	if (ret < 0) {
-+		payload->payload_state = 0;
-+		return ret;
-+	}
-+	payload->payload_state = DP_PAYLOAD_LOCAL;
-+	return 0;
- }
- 
- static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,
--				       struct drm_dp_mst_atomic_payload *payload)
-+				       struct drm_dp_mst_port *port,
-+				       int id,
-+				       struct drm_dp_payload *payload)
- {
- 	int ret;
--	struct drm_dp_mst_port *port = drm_dp_mst_topology_get_port_validated(mgr, payload->port);
--
--	if (!port)
--		return -EIO;
- 
--	ret = drm_dp_payload_send_msg(mgr, port, payload->vcpi, payload->pbn);
--	drm_dp_mst_topology_put_port(port);
-+	ret = drm_dp_payload_send_msg(mgr, port, id, port->vcpi.pbn);
-+	if (ret < 0)
-+		return ret;
-+	payload->payload_state = DP_PAYLOAD_REMOTE;
- 	return ret;
- }
- 
- static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,
--					struct drm_dp_mst_topology_state *mst_state,
--					struct drm_dp_mst_atomic_payload *payload)
-+					struct drm_dp_mst_port *port,
-+					int id,
-+					struct drm_dp_payload *payload)
- {
- 	drm_dbg_kms(mgr->dev, "\n");
--
- 	/* it's okay for these to fail */
--	drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0);
--	drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload->vc_start_slot, 0);
-+	if (port) {
-+		drm_dp_payload_send_msg(mgr, port, id, 0);
-+	}
- 
-+	drm_dp_dpcd_write_payload(mgr, id, payload);
-+	payload->payload_state = DP_PAYLOAD_DELETE_LOCAL;
-+	return 0;
-+}
-+
-+static int drm_dp_destroy_payload_step2(struct drm_dp_mst_topology_mgr *mgr,
-+					int id,
-+					struct drm_dp_payload *payload)
-+{
-+	payload->payload_state = 0;
- 	return 0;
- }
- 
- /**
-- * drm_dp_add_payload_part1() - Execute payload update part 1
-- * @mgr: Manager to use.
-- * @mst_state: The MST atomic state
-- * @payload: The payload to write
-+ * drm_dp_update_payload_part1() - Execute payload update part 1
-+ * @mgr: manager to use.
-+ * @start_slot: this is the cur slot
-+ *
-+ * NOTE: start_slot is a temporary workaround for non-atomic drivers,
-+ * this will be removed when non-atomic mst helpers are moved out of the helper
-  *
-- * Determines the starting time slot for the given payload, and programs the VCPI for this payload
-- * into hardware. After calling this, the driver should generate ACT and payload packets.
-+ * This iterates over all proposed virtual channels, and tries to
-+ * allocate space in the link for them. For 0->slots transitions,
-+ * this step just writes the VCPI to the MST device. For slots->0
-+ * transitions, this writes the updated VCPIs and removes the
-+ * remote VC payloads.
-  *
-- * Returns: 0 on success, error code on failure. In the event that this fails,
-- * @payload.vc_start_slot will also be set to -1.
-+ * after calling this the driver should generate ACT and payload
-+ * packets.
-  */
--int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
--			     struct drm_dp_mst_topology_state *mst_state,
--			     struct drm_dp_mst_atomic_payload *payload)
-+int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr, int start_slot)
- {
-+	struct drm_dp_payload req_payload;
- 	struct drm_dp_mst_port *port;
--	int ret;
-+	int i, j;
-+	int cur_slots = start_slot;
-+	bool skip;
- 
--	port = drm_dp_mst_topology_get_port_validated(mgr, payload->port);
--	if (!port)
--		return 0;
-+	mutex_lock(&mgr->payload_lock);
-+	for (i = 0; i < mgr->max_payloads; i++) {
-+		struct drm_dp_vcpi *vcpi = mgr->proposed_vcpis[i];
-+		struct drm_dp_payload *payload = &mgr->payloads[i];
-+		bool put_port = false;
- 
--	if (mgr->payload_count == 0)
--		mgr->next_start_slot = mst_state->start_slot;
-+		/* solve the current payloads - compare to the hw ones
-+		   - update the hw view */
-+		req_payload.start_slot = cur_slots;
-+		if (vcpi) {
-+			port = container_of(vcpi, struct drm_dp_mst_port,
-+					    vcpi);
- 
--	payload->vc_start_slot = mgr->next_start_slot;
-+			mutex_lock(&mgr->lock);
-+			skip = !drm_dp_mst_port_downstream_of_branch(port, mgr->mst_primary);
-+			mutex_unlock(&mgr->lock);
- 
--	ret = drm_dp_create_payload_step1(mgr, payload);
--	drm_dp_mst_topology_put_port(port);
--	if (ret < 0) {
--		drm_warn(mgr->dev, "Failed to create MST payload for port %p: %d\n",
--			 payload->port, ret);
--		payload->vc_start_slot = -1;
--		return ret;
--	}
-+			if (skip) {
-+				drm_dbg_kms(mgr->dev,
-+					    "Virtual channel %d is not in current topology\n",
-+					    i);
-+				continue;
-+			}
-+			/* Validated ports don't matter if we're releasing
-+			 * VCPI
-+			 */
-+			if (vcpi->num_slots) {
-+				port = drm_dp_mst_topology_get_port_validated(
-+				    mgr, port);
-+				if (!port) {
-+					if (vcpi->num_slots == payload->num_slots) {
-+						cur_slots += vcpi->num_slots;
-+						payload->start_slot = req_payload.start_slot;
-+						continue;
-+					} else {
-+						drm_dbg_kms(mgr->dev,
-+							    "Fail:set payload to invalid sink");
-+						mutex_unlock(&mgr->payload_lock);
-+						return -EINVAL;
-+					}
-+				}
-+				put_port = true;
-+			}
- 
--	mgr->payload_count++;
--	mgr->next_start_slot += payload->time_slots;
-+			req_payload.num_slots = vcpi->num_slots;
-+			req_payload.vcpi = vcpi->vcpi;
-+		} else {
-+			port = NULL;
-+			req_payload.num_slots = 0;
-+		}
- 
--	return 0;
--}
--EXPORT_SYMBOL(drm_dp_add_payload_part1);
-+		payload->start_slot = req_payload.start_slot;
-+		/* work out what is required to happen with this payload */
-+		if (payload->num_slots != req_payload.num_slots) {
-+
-+			/* need to push an update for this payload */
-+			if (req_payload.num_slots) {
-+				drm_dp_create_payload_step1(mgr, vcpi->vcpi,
-+							    &req_payload);
-+				payload->num_slots = req_payload.num_slots;
-+				payload->vcpi = req_payload.vcpi;
-+
-+			} else if (payload->num_slots) {
-+				payload->num_slots = 0;
-+				drm_dp_destroy_payload_step1(mgr, port,
-+							     payload->vcpi,
-+							     payload);
-+				req_payload.payload_state =
-+					payload->payload_state;
-+				payload->start_slot = 0;
-+			}
-+			payload->payload_state = req_payload.payload_state;
-+		}
-+		cur_slots += req_payload.num_slots;
- 
--/**
-- * drm_dp_remove_payload() - Remove an MST payload
-- * @mgr: Manager to use.
-- * @mst_state: The MST atomic state
-- * @payload: The payload to write
-- *
-- * Removes a payload from an MST topology if it was successfully assigned a start slot. Also updates
-- * the starting time slots of all other payloads which would have been shifted towards the start of
-- * the VC table as a result. After calling this, the driver should generate ACT and payload packets.
-- */
--void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
--			   struct drm_dp_mst_topology_state *mst_state,
--			   struct drm_dp_mst_atomic_payload *payload)
--{
--	struct drm_dp_mst_atomic_payload *pos;
--	bool send_remove = false;
-+		if (put_port)
-+			drm_dp_mst_topology_put_port(port);
-+	}
- 
--	/* We failed to make the payload, so nothing to do */
--	if (payload->vc_start_slot == -1)
--		return;
-+	for (i = 0; i < mgr->max_payloads; /* do nothing */) {
-+		if (mgr->payloads[i].payload_state != DP_PAYLOAD_DELETE_LOCAL) {
-+			i++;
-+			continue;
-+		}
- 
--	mutex_lock(&mgr->lock);
--	send_remove = drm_dp_mst_port_downstream_of_branch(payload->port, mgr->mst_primary);
--	mutex_unlock(&mgr->lock);
-+		drm_dbg_kms(mgr->dev, "removing payload %d\n", i);
-+		for (j = i; j < mgr->max_payloads - 1; j++) {
-+			mgr->payloads[j] = mgr->payloads[j + 1];
-+			mgr->proposed_vcpis[j] = mgr->proposed_vcpis[j + 1];
- 
--	if (send_remove)
--		drm_dp_destroy_payload_step1(mgr, mst_state, payload);
--	else
--		drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in topology, not sending remove\n",
--			    payload->vcpi);
-+			if (mgr->proposed_vcpis[j] &&
-+			    mgr->proposed_vcpis[j]->num_slots) {
-+				set_bit(j + 1, &mgr->payload_mask);
-+			} else {
-+				clear_bit(j + 1, &mgr->payload_mask);
-+			}
-+		}
- 
--	list_for_each_entry(pos, &mst_state->payloads, next) {
--		if (pos != payload && pos->vc_start_slot > payload->vc_start_slot)
--			pos->vc_start_slot -= payload->time_slots;
-+		memset(&mgr->payloads[mgr->max_payloads - 1], 0,
-+		       sizeof(struct drm_dp_payload));
-+		mgr->proposed_vcpis[mgr->max_payloads - 1] = NULL;
-+		clear_bit(mgr->max_payloads, &mgr->payload_mask);
- 	}
--	payload->vc_start_slot = -1;
-+	mutex_unlock(&mgr->payload_lock);
- 
--	mgr->payload_count--;
--	mgr->next_start_slot -= payload->time_slots;
-+	return 0;
- }
--EXPORT_SYMBOL(drm_dp_remove_payload);
-+EXPORT_SYMBOL(drm_dp_update_payload_part1);
- 
- /**
-- * drm_dp_add_payload_part2() - Execute payload update part 2
-- * @mgr: Manager to use.
-- * @state: The global atomic state
-- * @payload: The payload to update
-- *
-- * If @payload was successfully assigned a starting time slot by drm_dp_add_payload_part1(), this
-- * function will send the sideband messages to finish allocating this payload.
-+ * drm_dp_update_payload_part2() - Execute payload update part 2
-+ * @mgr: manager to use.
-  *
-- * Returns: 0 on success, negative error code on failure.
-+ * This iterates over all proposed virtual channels, and tries to
-+ * allocate space in the link for them. For 0->slots transitions,
-+ * this step writes the remote VC payload commands. For slots->0
-+ * this just resets some internal state.
-  */
--int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
--			     struct drm_atomic_state *state,
--			     struct drm_dp_mst_atomic_payload *payload)
-+int drm_dp_update_payload_part2(struct drm_dp_mst_topology_mgr *mgr)
- {
-+	struct drm_dp_mst_port *port;
-+	int i;
- 	int ret = 0;
-+	bool skip;
- 
--	/* Skip failed payloads */
--	if (payload->vc_start_slot == -1) {
--		drm_dbg_kms(state->dev, "Part 1 of payload creation for %s failed, skipping part 2\n",
--			    payload->port->connector->name);
--		return -EIO;
--	}
-+	mutex_lock(&mgr->payload_lock);
-+	for (i = 0; i < mgr->max_payloads; i++) {
- 
--	ret = drm_dp_create_payload_step2(mgr, payload);
--	if (ret < 0) {
--		if (!payload->delete)
--			drm_err(mgr->dev, "Step 2 of creating MST payload for %p failed: %d\n",
--				payload->port, ret);
--		else
--			drm_dbg_kms(mgr->dev, "Step 2 of removing MST payload for %p failed: %d\n",
--				    payload->port, ret);
--	}
-+		if (!mgr->proposed_vcpis[i])
-+			continue;
- 
--	return ret;
-+		port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi);
-+
-+		mutex_lock(&mgr->lock);
-+		skip = !drm_dp_mst_port_downstream_of_branch(port, mgr->mst_primary);
-+		mutex_unlock(&mgr->lock);
-+
-+		if (skip)
-+			continue;
-+
-+		drm_dbg_kms(mgr->dev, "payload %d %d\n", i, mgr->payloads[i].payload_state);
-+		if (mgr->payloads[i].payload_state == DP_PAYLOAD_LOCAL) {
-+			ret = drm_dp_create_payload_step2(mgr, port, mgr->proposed_vcpis[i]->vcpi, &mgr->payloads[i]);
-+		} else if (mgr->payloads[i].payload_state == DP_PAYLOAD_DELETE_LOCAL) {
-+			ret = drm_dp_destroy_payload_step2(mgr, mgr->proposed_vcpis[i]->vcpi, &mgr->payloads[i]);
-+		}
-+		if (ret) {
-+			mutex_unlock(&mgr->payload_lock);
-+			return ret;
-+		}
-+	}
-+	mutex_unlock(&mgr->payload_lock);
-+	return 0;
- }
--EXPORT_SYMBOL(drm_dp_add_payload_part2);
-+EXPORT_SYMBOL(drm_dp_update_payload_part2);
- 
- static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr,
- 				 struct drm_dp_mst_port *port,
-@@ -3591,6 +3711,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
- 	int ret = 0;
- 	struct drm_dp_mst_branch *mstb = NULL;
- 
-+	mutex_lock(&mgr->payload_lock);
- 	mutex_lock(&mgr->lock);
- 	if (mst_state == mgr->mst_state)
- 		goto out_unlock;
-@@ -3598,6 +3719,10 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
- 	mgr->mst_state = mst_state;
- 	/* set the device into MST mode */
- 	if (mst_state) {
-+		struct drm_dp_payload reset_pay;
-+		int lane_count;
-+		int link_rate;
-+
- 		WARN_ON(mgr->mst_primary);
- 
- 		/* get dpcd info */
-@@ -3608,6 +3733,16 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
- 			goto out_unlock;
- 		}
- 
-+		lane_count = min_t(int, mgr->dpcd[2] & DP_MAX_LANE_COUNT_MASK, mgr->max_lane_count);
-+		link_rate = min_t(int, drm_dp_bw_code_to_link_rate(mgr->dpcd[1]), mgr->max_link_rate);
-+		mgr->pbn_div = drm_dp_get_vc_payload_bw(mgr,
-+							link_rate,
-+							lane_count);
-+		if (mgr->pbn_div == 0) {
-+			ret = -EINVAL;
-+			goto out_unlock;
-+		}
-+
- 		/* add initial branch device at LCT 1 */
- 		mstb = drm_dp_add_mst_branch_device(1, NULL);
- 		if (mstb == NULL) {
-@@ -3627,8 +3762,9 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
- 		if (ret < 0)
- 			goto out_unlock;
- 
--		/* Write reset payload */
--		drm_dp_dpcd_write_payload(mgr, 0, 0, 0x3f);
-+		reset_pay.start_slot = 0;
-+		reset_pay.num_slots = 0x3f;
-+		drm_dp_dpcd_write_payload(mgr, 0, &reset_pay);
- 
- 		queue_work(system_long_wq, &mgr->work);
- 
-@@ -3640,11 +3776,19 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
- 		/* this can fail if the device is gone */
- 		drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL, 0);
- 		ret = 0;
-+		memset(mgr->payloads, 0,
-+		       mgr->max_payloads * sizeof(mgr->payloads[0]));
-+		memset(mgr->proposed_vcpis, 0,
-+		       mgr->max_payloads * sizeof(mgr->proposed_vcpis[0]));
-+		mgr->payload_mask = 0;
-+		set_bit(0, &mgr->payload_mask);
-+		mgr->vcpi_mask = 0;
- 		mgr->payload_id_table_cleared = false;
- 	}
- 
- out_unlock:
- 	mutex_unlock(&mgr->lock);
-+	mutex_unlock(&mgr->payload_lock);
- 	if (mstb)
- 		drm_dp_mst_topology_put_mstb(mstb);
- 	return ret;
-@@ -4163,18 +4307,62 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_
- }
- EXPORT_SYMBOL(drm_dp_mst_get_edid);
- 
-+/**
-+ * drm_dp_find_vcpi_slots() - Find time slots for this PBN value
-+ * @mgr: manager to use
-+ * @pbn: payload bandwidth to convert into slots.
-+ *
-+ * Calculate the number of time slots that will be required for the given PBN
-+ * value. This function is deprecated, and should not be used in atomic
-+ * drivers.
-+ *
-+ * RETURNS:
-+ * The total slots required for this port, or error.
-+ */
-+int drm_dp_find_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr,
-+			   int pbn)
-+{
-+	int num_slots;
-+
-+	num_slots = DIV_ROUND_UP(pbn, mgr->pbn_div);
-+
-+	/* max. time slots - one slot for MTP header */
-+	if (num_slots > 63)
-+		return -ENOSPC;
-+	return num_slots;
-+}
-+EXPORT_SYMBOL(drm_dp_find_vcpi_slots);
-+
-+static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr,
-+			    struct drm_dp_vcpi *vcpi, int pbn, int slots)
-+{
-+	int ret;
-+
-+	vcpi->pbn = pbn;
-+	vcpi->aligned_pbn = slots * mgr->pbn_div;
-+	vcpi->num_slots = slots;
-+
-+	ret = drm_dp_mst_assign_payload_id(mgr, vcpi);
-+	if (ret < 0)
-+		return ret;
-+	return 0;
-+}
-+
- /**
-  * drm_dp_atomic_find_time_slots() - Find and add time slots to the state
-  * @state: global atomic state
-  * @mgr: MST topology manager for the port
-  * @port: port to find time slots for
-  * @pbn: bandwidth required for the mode in PBN
-+ * @pbn_div: divider for DSC mode that takes FEC into account
-  *
-- * Allocates time slots to @port, replacing any previous time slot allocations it may
-- * have had. Any atomic drivers which support MST must call this function in
-- * their &drm_encoder_helper_funcs.atomic_check() callback unconditionally to
-- * change the current time slot allocation for the new state, and ensure the MST
-- * atomic state is added whenever the state of payloads in the topology changes.
-+ * Allocates time slots to @port, replacing any previous timeslot allocations it
-+ * may have had. Any atomic drivers which support MST must call this function
-+ * in their &drm_encoder_helper_funcs.atomic_check() callback to change the
-+ * current timeslot allocation for the new state, but only when
-+ * &drm_crtc_state.mode_changed or &drm_crtc_state.connectors_changed is set
-+ * to ensure compatibility with userspace applications that still use the
-+ * legacy modesetting UAPI.
-  *
-  * Allocations set by this function are not checked against the bandwidth
-  * restraints of @mgr until the driver calls drm_dp_mst_atomic_check().
-@@ -4193,7 +4381,8 @@ EXPORT_SYMBOL(drm_dp_mst_get_edid);
-  */
- int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,
- 				  struct drm_dp_mst_topology_mgr *mgr,
--				  struct drm_dp_mst_port *port, int pbn)
-+				  struct drm_dp_mst_port *port, int pbn,
-+				  int pbn_div)
- {
- 	struct drm_dp_mst_topology_state *topology_state;
- 	struct drm_dp_mst_atomic_payload *payload = NULL;
-@@ -4226,7 +4415,10 @@ int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,
- 		}
- 	}
- 
--	req_slots = DIV_ROUND_UP(pbn, topology_state->pbn_div);
-+	if (pbn_div <= 0)
-+		pbn_div = mgr->pbn_div;
-+
-+	req_slots = DIV_ROUND_UP(pbn, pbn_div);
- 
- 	drm_dbg_atomic(mgr->dev, "[CONNECTOR:%d:%s] [MST PORT:%p] TU %d -> %d\n",
- 		       port->connector->base.id, port->connector->name,
-@@ -4235,7 +4427,7 @@ int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,
- 		       port->connector->base.id, port->connector->name,
- 		       port, prev_bw, pbn);
- 
--	/* Add the new allocation to the state, note the VCPI isn't assigned until the end */
-+	/* Add the new allocation to the state */
- 	if (!payload) {
- 		payload = kzalloc(sizeof(*payload), GFP_KERNEL);
- 		if (!payload)
-@@ -4243,7 +4435,6 @@ int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,
- 
- 		drm_dp_mst_get_port_malloc(port);
- 		payload->port = port;
--		payload->vc_start_slot = -1;
- 		list_add(&payload->next, &topology_state->payloads);
- 	}
- 	payload->time_slots = req_slots;
-@@ -4260,12 +4451,10 @@ EXPORT_SYMBOL(drm_dp_atomic_find_time_slots);
-  * @port: The port to release the time slots from
-  *
-  * Releases any time slots that have been allocated to a port in the atomic
-- * state. Any atomic drivers which support MST must call this function
-- * unconditionally in their &drm_connector_helper_funcs.atomic_check() callback.
-- * This helper will check whether time slots would be released by the new state and
-- * respond accordingly, along with ensuring the MST state is always added to the
-- * atomic state whenever a new state would modify the state of payloads on the
-- * topology.
-+ * state. Any atomic drivers which support MST must call this function in
-+ * their &drm_connector_helper_funcs.atomic_check() callback when the
-+ * connector will no longer have VCPI allocated (e.g. because its CRTC was
-+ * removed) when it had VCPI allocated in the previous atomic state.
-  *
-  * It is OK to call this even if @port has been removed from the system.
-  * Additionally, it is OK to call this function multiple times on the same
-@@ -4330,7 +4519,6 @@ int drm_dp_atomic_release_time_slots(struct drm_atomic_state *state,
- 		drm_dp_mst_put_port_malloc(port);
- 		payload->pbn = 0;
- 		payload->delete = true;
--		topology_state->payload_mask &= ~BIT(payload->vcpi - 1);
- 	}
- 
- 	return 0;
-@@ -4381,8 +4569,7 @@ int drm_dp_mst_atomic_setup_commit(struct drm_atomic_state *state)
- EXPORT_SYMBOL(drm_dp_mst_atomic_setup_commit);
- 
- /**
-- * drm_dp_mst_atomic_wait_for_dependencies() - Wait for all pending commits on MST topologies,
-- * prepare new MST state for commit
-+ * drm_dp_mst_atomic_wait_for_dependencies() - Wait for all pending commits on MST topologies
-  * @state: global atomic state
-  *
-  * Goes through any MST topologies in this atomic state, and waits for any pending commits which
-@@ -4400,30 +4587,17 @@ EXPORT_SYMBOL(drm_dp_mst_atomic_setup_commit);
-  */
- void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)
- {
--	struct drm_dp_mst_topology_state *old_mst_state, *new_mst_state;
-+	struct drm_dp_mst_topology_state *old_mst_state;
- 	struct drm_dp_mst_topology_mgr *mgr;
--	struct drm_dp_mst_atomic_payload *old_payload, *new_payload;
- 	int i, j, ret;
- 
--	for_each_oldnew_mst_mgr_in_state(state, mgr, old_mst_state, new_mst_state, i) {
-+	for_each_old_mst_mgr_in_state(state, mgr, old_mst_state, i) {
- 		for (j = 0; j < old_mst_state->num_commit_deps; j++) {
- 			ret = drm_crtc_commit_wait(old_mst_state->commit_deps[j]);
- 			if (ret < 0)
- 				drm_err(state->dev, "Failed to wait for %s: %d\n",
- 					old_mst_state->commit_deps[j]->crtc->name, ret);
- 		}
--
--		/* Now that previous state is committed, it's safe to copy over the start slot
--		 * assignments
--		 */
--		list_for_each_entry(old_payload, &old_mst_state->payloads, next) {
--			if (old_payload->delete)
--				continue;
--
--			new_payload = drm_atomic_get_mst_payload_state(new_mst_state,
--								       old_payload->port);
--			new_payload->vc_start_slot = old_payload->vc_start_slot;
--		}
- 	}
- }
- EXPORT_SYMBOL(drm_dp_mst_atomic_wait_for_dependencies);
-@@ -4508,8 +4682,119 @@ void drm_dp_mst_update_slots(struct drm_dp_mst_topology_state *mst_state, uint8_
- }
- EXPORT_SYMBOL(drm_dp_mst_update_slots);
- 
-+/**
-+ * drm_dp_mst_allocate_vcpi() - Allocate a virtual channel
-+ * @mgr: manager for this port
-+ * @port: port to allocate a virtual channel for.
-+ * @pbn: payload bandwidth number to request
-+ * @slots: returned number of slots for this PBN.
-+ */
-+bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
-+			      struct drm_dp_mst_port *port, int pbn, int slots)
-+{
-+	int ret;
-+
-+	if (slots < 0)
-+		return false;
-+
-+	port = drm_dp_mst_topology_get_port_validated(mgr, port);
-+	if (!port)
-+		return false;
-+
-+	if (port->vcpi.vcpi > 0) {
-+		drm_dbg_kms(mgr->dev,
-+			    "payload: vcpi %d already allocated for pbn %d - requested pbn %d\n",
-+			    port->vcpi.vcpi, port->vcpi.pbn, pbn);
-+		if (pbn == port->vcpi.pbn) {
-+			drm_dp_mst_topology_put_port(port);
-+			return true;
-+		}
-+	}
-+
-+	ret = drm_dp_init_vcpi(mgr, &port->vcpi, pbn, slots);
-+	if (ret) {
-+		drm_dbg_kms(mgr->dev, "failed to init time slots=%d ret=%d\n",
-+			    DIV_ROUND_UP(pbn, mgr->pbn_div), ret);
-+		drm_dp_mst_topology_put_port(port);
-+		goto out;
-+	}
-+	drm_dbg_kms(mgr->dev, "initing vcpi for pbn=%d slots=%d\n", pbn, port->vcpi.num_slots);
-+
-+	/* Keep port allocated until its payload has been removed */
-+	drm_dp_mst_get_port_malloc(port);
-+	drm_dp_mst_topology_put_port(port);
-+	return true;
-+out:
-+	return false;
-+}
-+EXPORT_SYMBOL(drm_dp_mst_allocate_vcpi);
-+
-+int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port)
-+{
-+	int slots = 0;
-+
-+	port = drm_dp_mst_topology_get_port_validated(mgr, port);
-+	if (!port)
-+		return slots;
-+
-+	slots = port->vcpi.num_slots;
-+	drm_dp_mst_topology_put_port(port);
-+	return slots;
-+}
-+EXPORT_SYMBOL(drm_dp_mst_get_vcpi_slots);
-+
-+/**
-+ * drm_dp_mst_reset_vcpi_slots() - Reset number of slots to 0 for VCPI
-+ * @mgr: manager for this port
-+ * @port: unverified pointer to a port.
-+ *
-+ * This just resets the number of slots for the ports VCPI for later programming.
-+ */
-+void drm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port)
-+{
-+	/*
-+	 * A port with VCPI will remain allocated until its VCPI is
-+	 * released, no verified ref needed
-+	 */
-+
-+	port->vcpi.num_slots = 0;
-+}
-+EXPORT_SYMBOL(drm_dp_mst_reset_vcpi_slots);
-+
-+/**
-+ * drm_dp_mst_deallocate_vcpi() - deallocate a VCPI
-+ * @mgr: manager for this port
-+ * @port: port to deallocate vcpi for
-+ *
-+ * This can be called unconditionally, regardless of whether
-+ * drm_dp_mst_allocate_vcpi() succeeded or not.
-+ */
-+void drm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
-+				struct drm_dp_mst_port *port)
-+{
-+	bool skip;
-+
-+	if (!port->vcpi.vcpi)
-+		return;
-+
-+	mutex_lock(&mgr->lock);
-+	skip = !drm_dp_mst_port_downstream_of_branch(port, mgr->mst_primary);
-+	mutex_unlock(&mgr->lock);
-+
-+	if (skip)
-+		return;
-+
-+	drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
-+	port->vcpi.num_slots = 0;
-+	port->vcpi.pbn = 0;
-+	port->vcpi.aligned_pbn = 0;
-+	port->vcpi.vcpi = 0;
-+	drm_dp_mst_put_port_malloc(port);
-+}
-+EXPORT_SYMBOL(drm_dp_mst_deallocate_vcpi);
-+
- static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr,
--				     int id, u8 start_slot, u8 num_slots)
-+				     int id, struct drm_dp_payload *payload)
- {
- 	u8 payload_alloc[3], status;
- 	int ret;
-@@ -4519,8 +4804,8 @@ static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr,
- 			   DP_PAYLOAD_TABLE_UPDATED);
- 
- 	payload_alloc[0] = id;
--	payload_alloc[1] = start_slot;
--	payload_alloc[2] = num_slots;
-+	payload_alloc[1] = payload->start_slot;
-+	payload_alloc[2] = payload->num_slots;
- 
- 	ret = drm_dp_dpcd_write(mgr->aux, DP_PAYLOAD_ALLOCATE_SET, payload_alloc, 3);
- 	if (ret != 3) {
-@@ -4735,9 +5020,8 @@ static void fetch_monitor_name(struct drm_dp_mst_topology_mgr *mgr,
- void drm_dp_mst_dump_topology(struct seq_file *m,
- 			      struct drm_dp_mst_topology_mgr *mgr)
- {
--	struct drm_dp_mst_topology_state *state;
--	struct drm_dp_mst_atomic_payload *payload;
--	int i, ret;
-+	int i;
-+	struct drm_dp_mst_port *port;
- 
- 	mutex_lock(&mgr->lock);
- 	if (mgr->mst_primary)
-@@ -4746,35 +5030,36 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
- 	/* dump VCPIs */
- 	mutex_unlock(&mgr->lock);
- 
--	ret = drm_modeset_lock_single_interruptible(&mgr->base.lock);
--	if (ret < 0)
--		return;
-+	mutex_lock(&mgr->payload_lock);
-+	seq_printf(m, "\n*** VCPI Info ***\n");
-+	seq_printf(m, "payload_mask: %lx, vcpi_mask: %lx, max_payloads: %d\n", mgr->payload_mask, mgr->vcpi_mask, mgr->max_payloads);
- 
--	state = to_drm_dp_mst_topology_state(mgr->base.state);
--	seq_printf(m, "\n*** Atomic state info ***\n");
--	seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot: %u, pbn_div: %d\n",
--		   state->payload_mask, mgr->max_payloads, state->start_slot, state->pbn_div);
--
--	seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc |     sink name     |\n");
-+	seq_printf(m, "\n|   idx   |  port # |  vcp_id | # slots |     sink name     |\n");
- 	for (i = 0; i < mgr->max_payloads; i++) {
--		list_for_each_entry(payload, &state->payloads, next) {
-+		if (mgr->proposed_vcpis[i]) {
- 			char name[14];
- 
--			if (payload->vcpi != i || payload->delete)
--				continue;
--
--			fetch_monitor_name(mgr, payload->port, name, sizeof(name));
--			seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s %19s\n",
-+			port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi);
-+			fetch_monitor_name(mgr, port, name, sizeof(name));
-+			seq_printf(m, "%10d%10d%10d%10d%20s\n",
- 				   i,
--				   payload->port->port_num,
--				   payload->vcpi,
--				   payload->vc_start_slot,
--				   payload->vc_start_slot + payload->time_slots - 1,
--				   payload->pbn,
--				   payload->dsc_enabled ? "Y" : "N",
-+				   port->port_num,
-+				   port->vcpi.vcpi,
-+				   port->vcpi.num_slots,
- 				   (*name != 0) ? name : "Unknown");
--		}
-+		} else
-+			seq_printf(m, "%6d - Unused\n", i);
-+	}
-+	seq_printf(m, "\n*** Payload Info ***\n");
-+	seq_printf(m, "|   idx   |  state  |  start slot  | # slots |\n");
-+	for (i = 0; i < mgr->max_payloads; i++) {
-+		seq_printf(m, "%10d%10d%15d%10d\n",
-+			   i,
-+			   mgr->payloads[i].payload_state,
-+			   mgr->payloads[i].start_slot,
-+			   mgr->payloads[i].num_slots);
- 	}
-+	mutex_unlock(&mgr->payload_lock);
- 
- 	seq_printf(m, "\n*** DPCD Info ***\n");
- 	mutex_lock(&mgr->lock);
-@@ -4820,7 +5105,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
- 
- out:
- 	mutex_unlock(&mgr->lock);
--	drm_modeset_unlock(&mgr->base.lock);
-+
- }
- EXPORT_SYMBOL(drm_dp_mst_dump_topology);
- 
-@@ -5141,22 +5426,9 @@ drm_dp_mst_atomic_check_payload_alloc_limits(struct drm_dp_mst_topology_mgr *mgr
- 				       mgr, mst_state, mgr->max_payloads);
- 			return -EINVAL;
- 		}
--
--		/* Assign a VCPI */
--		if (!payload->vcpi) {
--			payload->vcpi = ffz(mst_state->payload_mask) + 1;
--			drm_dbg_atomic(mgr->dev, "[MST PORT:%p] assigned VCPI #%d\n",
--				       payload->port, payload->vcpi);
--			mst_state->payload_mask |= BIT(payload->vcpi - 1);
--		}
- 	}
--
--	if (!payload_count)
--		mst_state->pbn_div = 0;
--
--	drm_dbg_atomic(mgr->dev, "[MST MGR:%p] mst state %p TU pbn_div=%d avail=%d used=%d\n",
--		       mgr, mst_state, mst_state->pbn_div, avail_slots,
--		       mst_state->total_avail_slots - avail_slots);
-+	drm_dbg_atomic(mgr->dev, "[MST MGR:%p] mst state %p TU avail=%d used=%d\n",
-+		       mgr, mst_state, avail_slots, mst_state->total_avail_slots - avail_slots);
- 
- 	return 0;
- }
-@@ -5227,6 +5499,7 @@ EXPORT_SYMBOL(drm_dp_mst_add_affected_dsc_crtcs);
-  * @state: Pointer to the new drm_atomic_state
-  * @port: Pointer to the affected MST Port
-  * @pbn: Newly recalculated bw required for link with DSC enabled
-+ * @pbn_div: Divider to calculate correct number of pbn per slot
-  * @enable: Boolean flag to enable or disable DSC on the port
-  *
-  * This function enables DSC on the given Port
-@@ -5237,7 +5510,8 @@ EXPORT_SYMBOL(drm_dp_mst_add_affected_dsc_crtcs);
-  */
- int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_state *state,
- 				 struct drm_dp_mst_port *port,
--				 int pbn, bool enable)
-+				 int pbn, int pbn_div,
-+				 bool enable)
- {
- 	struct drm_dp_mst_topology_state *mst_state;
- 	struct drm_dp_mst_atomic_payload *payload;
-@@ -5263,7 +5537,7 @@ int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_state *state,
- 	}
- 
- 	if (enable) {
--		time_slots = drm_dp_atomic_find_time_slots(state, port->mgr, port, pbn);
-+		time_slots = drm_dp_atomic_find_time_slots(state, port->mgr, port, pbn, pbn_div);
- 		drm_dbg_atomic(state->dev,
- 			       "[MST PORT:%p] Enabling DSC flag, reallocating %d time slots on the port\n",
- 			       port, time_slots);
-@@ -5276,7 +5550,6 @@ int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_state *state,
- 	return time_slots;
- }
- EXPORT_SYMBOL(drm_dp_mst_atomic_enable_dsc);
--
- /**
-  * drm_dp_mst_atomic_check - Check that the new state of an MST topology in an
-  * atomic update is valid
-@@ -5334,6 +5607,7 @@ EXPORT_SYMBOL(drm_dp_mst_topology_state_funcs);
- 
- /**
-  * drm_atomic_get_mst_topology_state: get MST topology state
-+ *
-  * @state: global atomic state
-  * @mgr: MST topology manager, also the private object in this case
-  *
-@@ -5352,31 +5626,6 @@ struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_a
- }
- EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
- 
--/**
-- * drm_atomic_get_new_mst_topology_state: get new MST topology state in atomic state, if any
-- * @state: global atomic state
-- * @mgr: MST topology manager, also the private object in this case
-- *
-- * This function wraps drm_atomic_get_priv_obj_state() passing in the MST atomic
-- * state vtable so that the private object state returned is that of a MST
-- * topology object.
-- *
-- * Returns:
-- *
-- * The MST topology state, or NULL if there's no topology state for this MST mgr
-- * in the global atomic state
-- */
--struct drm_dp_mst_topology_state *
--drm_atomic_get_new_mst_topology_state(struct drm_atomic_state *state,
--				      struct drm_dp_mst_topology_mgr *mgr)
--{
--	struct drm_private_state *priv_state =
--		drm_atomic_get_new_private_obj_state(state, &mgr->base);
--
--	return priv_state ? to_dp_mst_topology_state(priv_state) : NULL;
--}
--EXPORT_SYMBOL(drm_atomic_get_new_mst_topology_state);
--
- /**
-  * drm_dp_mst_topology_mgr_init - initialise a topology manager
-  * @mgr: manager struct to initialise
-@@ -5384,6 +5633,8 @@ EXPORT_SYMBOL(drm_atomic_get_new_mst_topology_state);
-  * @aux: DP helper aux channel to talk to this device
-  * @max_dpcd_transaction_bytes: hw specific DPCD transaction limit
-  * @max_payloads: maximum number of payloads this GPU can source
-+ * @max_lane_count: maximum number of lanes this GPU supports
-+ * @max_link_rate: maximum link rate per lane this GPU supports in kHz
-  * @conn_base_id: the connector object ID the MST device is connected to.
-  *
-  * Return 0 for success, or negative error code on failure
-@@ -5391,12 +5642,14 @@ EXPORT_SYMBOL(drm_atomic_get_new_mst_topology_state);
- int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
- 				 struct drm_device *dev, struct drm_dp_aux *aux,
- 				 int max_dpcd_transaction_bytes, int max_payloads,
-+				 int max_lane_count, int max_link_rate,
- 				 int conn_base_id)
- {
- 	struct drm_dp_mst_topology_state *mst_state;
- 
- 	mutex_init(&mgr->lock);
- 	mutex_init(&mgr->qlock);
-+	mutex_init(&mgr->payload_lock);
- 	mutex_init(&mgr->delayed_destroy_lock);
- 	mutex_init(&mgr->up_req_lock);
- 	mutex_init(&mgr->probe_lock);
-@@ -5426,7 +5679,19 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
- 	mgr->aux = aux;
- 	mgr->max_dpcd_transaction_bytes = max_dpcd_transaction_bytes;
- 	mgr->max_payloads = max_payloads;
-+	mgr->max_lane_count = max_lane_count;
-+	mgr->max_link_rate = max_link_rate;
- 	mgr->conn_base_id = conn_base_id;
-+	if (max_payloads + 1 > sizeof(mgr->payload_mask) * 8 ||
-+	    max_payloads + 1 > sizeof(mgr->vcpi_mask) * 8)
-+		return -EINVAL;
-+	mgr->payloads = kcalloc(max_payloads, sizeof(struct drm_dp_payload), GFP_KERNEL);
-+	if (!mgr->payloads)
-+		return -ENOMEM;
-+	mgr->proposed_vcpis = kcalloc(max_payloads, sizeof(struct drm_dp_vcpi *), GFP_KERNEL);
-+	if (!mgr->proposed_vcpis)
-+		return -ENOMEM;
-+	set_bit(0, &mgr->payload_mask);
- 
- 	mst_state = kzalloc(sizeof(*mst_state), GFP_KERNEL);
- 	if (mst_state == NULL)
-@@ -5459,12 +5724,19 @@ void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr)
- 		destroy_workqueue(mgr->delayed_destroy_wq);
- 		mgr->delayed_destroy_wq = NULL;
- 	}
-+	mutex_lock(&mgr->payload_lock);
-+	kfree(mgr->payloads);
-+	mgr->payloads = NULL;
-+	kfree(mgr->proposed_vcpis);
-+	mgr->proposed_vcpis = NULL;
-+	mutex_unlock(&mgr->payload_lock);
- 	mgr->dev = NULL;
- 	mgr->aux = NULL;
- 	drm_atomic_private_obj_fini(&mgr->base);
- 	mgr->funcs = NULL;
- 
- 	mutex_destroy(&mgr->delayed_destroy_lock);
-+	mutex_destroy(&mgr->payload_lock);
- 	mutex_destroy(&mgr->qlock);
- 	mutex_destroy(&mgr->lock);
- 	mutex_destroy(&mgr->up_req_lock);
-diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
-index 03604a37931c..e01a40f35284 100644
---- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
-+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
-@@ -52,7 +52,6 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
- 	struct drm_atomic_state *state = crtc_state->uapi.state;
- 	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder);
- 	struct intel_dp *intel_dp = &intel_mst->primary->dp;
--	struct drm_dp_mst_topology_state *mst_state;
- 	struct intel_connector *connector =
- 		to_intel_connector(conn_state->connector);
- 	struct drm_i915_private *i915 = to_i915(connector->base.dev);
-@@ -60,28 +59,22 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
- 		&crtc_state->hw.adjusted_mode;
- 	int bpp, slots = -EINVAL;
- 
--	mst_state = drm_atomic_get_mst_topology_state(state, &intel_dp->mst_mgr);
--	if (IS_ERR(mst_state))
--		return PTR_ERR(mst_state);
--
- 	crtc_state->lane_count = limits->max_lane_count;
- 	crtc_state->port_clock = limits->max_rate;
- 
--	// TODO: Handle pbn_div changes by adding a new MST helper
--	if (!mst_state->pbn_div) {
--		mst_state->pbn_div = drm_dp_get_vc_payload_bw(&intel_dp->mst_mgr,
--							      limits->max_rate,
--							      limits->max_lane_count);
--	}
--
- 	for (bpp = limits->max_bpp; bpp >= limits->min_bpp; bpp -= 2 * 3) {
-+
- 		crtc_state->pipe_bpp = bpp;
- 
- 		crtc_state->pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock,
- 						       crtc_state->pipe_bpp,
- 						       false);
- 		slots = drm_dp_atomic_find_time_slots(state, &intel_dp->mst_mgr,
--						      connector->port, crtc_state->pbn);
-+						      connector->port,
-+						      crtc_state->pbn,
-+						      drm_dp_get_vc_payload_bw(&intel_dp->mst_mgr,
-+									       crtc_state->port_clock,
-+									       crtc_state->lane_count));
- 		if (slots == -EDEADLK)
- 			return slots;
- 		if (slots >= 0)
-@@ -364,17 +357,21 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
- 	struct intel_dp *intel_dp = &dig_port->dp;
- 	struct intel_connector *connector =
- 		to_intel_connector(old_conn_state->connector);
--	struct drm_dp_mst_topology_state *mst_state =
--		drm_atomic_get_mst_topology_state(&state->base, &intel_dp->mst_mgr);
- 	struct drm_i915_private *i915 = to_i915(connector->base.dev);
-+	int start_slot = intel_dp_is_uhbr(old_crtc_state) ? 0 : 1;
-+	int ret;
- 
- 	drm_dbg_kms(&i915->drm, "active links %d\n",
- 		    intel_dp->active_mst_links);
- 
- 	intel_hdcp_disable(intel_mst->connector);
- 
--	drm_dp_remove_payload(&intel_dp->mst_mgr, mst_state,
--			      drm_atomic_get_mst_payload_state(mst_state, connector->port));
-+	drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, connector->port);
-+
-+	ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, start_slot);
-+	if (ret) {
-+		drm_dbg_kms(&i915->drm, "failed to update payload %d\n", ret);
-+	}
- 
- 	intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
- }
-@@ -402,6 +399,8 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
- 
- 	intel_disable_transcoder(old_crtc_state);
- 
-+	drm_dp_update_payload_part2(&intel_dp->mst_mgr);
-+
- 	clear_act_sent(encoder, old_crtc_state);
- 
- 	intel_de_rmw(dev_priv, TRANS_DDI_FUNC_CTL(old_crtc_state->cpu_transcoder),
-@@ -409,6 +408,8 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
- 
- 	wait_for_act_sent(encoder, old_crtc_state);
- 
-+	drm_dp_mst_deallocate_vcpi(&intel_dp->mst_mgr, connector->port);
-+
- 	intel_ddi_disable_transcoder_func(old_crtc_state);
- 
- 	if (DISPLAY_VER(dev_priv) >= 9)
-@@ -475,8 +476,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state,
- 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
- 	struct intel_connector *connector =
- 		to_intel_connector(conn_state->connector);
--	struct drm_dp_mst_topology_state *mst_state =
--		drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr);
-+	int start_slot = intel_dp_is_uhbr(pipe_config) ? 0 : 1;
- 	int ret;
- 	bool first_mst_stream;
- 
-@@ -502,13 +502,16 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state,
- 		dig_port->base.pre_enable(state, &dig_port->base,
- 						pipe_config, NULL);
- 
-+	ret = drm_dp_mst_allocate_vcpi(&intel_dp->mst_mgr,
-+				       connector->port,
-+				       pipe_config->pbn,
-+				       pipe_config->dp_m_n.tu);
-+	if (!ret)
-+		drm_err(&dev_priv->drm, "failed to allocate vcpi\n");
-+
- 	intel_dp->active_mst_links++;
- 
--	ret = drm_dp_add_payload_part1(&intel_dp->mst_mgr, mst_state,
--				       drm_atomic_get_mst_payload_state(mst_state, connector->port));
--	if (ret < 0)
--		drm_err(&dev_priv->drm, "Failed to create MST payload for %s: %d\n",
--			connector->base.name, ret);
-+	ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr, start_slot);
- 
- 	/*
- 	 * Before Gen 12 this is not done as part of
-@@ -531,10 +534,7 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state,
- 	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(encoder);
- 	struct intel_digital_port *dig_port = intel_mst->primary;
- 	struct intel_dp *intel_dp = &dig_port->dp;
--	struct intel_connector *connector = to_intel_connector(conn_state->connector);
- 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
--	struct drm_dp_mst_topology_state *mst_state =
--		drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr);
- 	enum transcoder trans = pipe_config->cpu_transcoder;
- 
- 	drm_WARN_ON(&dev_priv->drm, pipe_config->has_pch_encoder);
-@@ -562,8 +562,7 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state,
- 
- 	wait_for_act_sent(encoder, pipe_config);
- 
--	drm_dp_add_payload_part2(&intel_dp->mst_mgr, &state->base,
--				 drm_atomic_get_mst_payload_state(mst_state, connector->port));
-+	drm_dp_update_payload_part2(&intel_dp->mst_mgr);
- 
- 	if (DISPLAY_VER(dev_priv) >= 14 && pipe_config->fec_enable)
- 		intel_de_rmw(dev_priv, MTL_CHICKEN_TRANS(trans), 0,
-@@ -950,6 +949,8 @@ intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_base_id)
- 	struct intel_dp *intel_dp = &dig_port->dp;
- 	enum port port = dig_port->base.port;
- 	int ret;
-+	int max_source_rate =
-+		intel_dp->source_rates[intel_dp->num_source_rates - 1];
- 
- 	if (!HAS_DP_MST(i915) || intel_dp_is_edp(intel_dp))
- 		return 0;
-@@ -965,7 +966,10 @@ intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_base_id)
- 	/* create encoders */
- 	intel_dp_create_fake_mst_encoders(dig_port);
- 	ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, &i915->drm,
--					   &intel_dp->aux, 16, 3, conn_base_id);
-+					   &intel_dp->aux, 16, 3,
-+					   dig_port->max_lanes,
-+					   max_source_rate,
-+					   conn_base_id);
- 	if (ret) {
- 		intel_dp->mst_mgr.cbs = NULL;
- 		return ret;
-diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
-index 6406fd487ee5..987e02eea66a 100644
---- a/drivers/gpu/drm/i915/display/intel_hdcp.c
-+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
-@@ -31,30 +31,8 @@
- 
- static int intel_conn_to_vcpi(struct intel_connector *connector)
- {
--	struct drm_dp_mst_topology_mgr *mgr;
--	struct drm_dp_mst_atomic_payload *payload;
--	struct drm_dp_mst_topology_state *mst_state;
--	int vcpi = 0;
--
- 	/* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */
--	if (!connector->port)
--		return 0;
--	mgr = connector->port->mgr;
--
--	drm_modeset_lock(&mgr->base.lock, NULL);
--	mst_state = to_drm_dp_mst_topology_state(mgr->base.state);
--	payload = drm_atomic_get_mst_payload_state(mst_state, connector->port);
--	if (drm_WARN_ON(mgr->dev, !payload))
--		goto out;
--
--	vcpi = payload->vcpi;
--	if (drm_WARN_ON(mgr->dev, vcpi < 0)) {
--		vcpi = 0;
--		goto out;
--	}
--out:
--	drm_modeset_unlock(&mgr->base.lock);
--	return vcpi;
-+	return connector->port	? connector->port->vcpi.vcpi : 0;
- }
- 
- /*
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-index 33c97d510999..8400a5d8ea6e 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-@@ -932,7 +932,6 @@ struct nv50_msto {
- 	struct nv50_head *head;
- 	struct nv50_mstc *mstc;
- 	bool disabled;
--	bool enabled;
- };
- 
- struct nouveau_encoder *nv50_real_outp(struct drm_encoder *encoder)
-@@ -949,36 +948,58 @@ struct nouveau_encoder *nv50_real_outp(struct drm_encoder *encoder)
- }
- 
- static void
--nv50_msto_cleanup(struct drm_atomic_state *state,
--		  struct drm_dp_mst_topology_state *mst_state,
--		  struct drm_dp_mst_topology_mgr *mgr,
--		  struct nv50_msto *msto)
-+nv50_msto_cleanup(struct nv50_msto *msto)
- {
- 	struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
--	struct drm_dp_mst_atomic_payload *payload =
--		drm_atomic_get_mst_payload_state(mst_state, msto->mstc->port);
-+
-+	struct nv50_mstc *mstc = msto->mstc;
-+	struct nv50_mstm *mstm = mstc->mstm;
-+
-+	if (!msto->disabled)
-+		return;
- 
- 	NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
- 
--	if (msto->disabled) {
--		msto->mstc = NULL;
--		msto->disabled = false;
--	} else if (msto->enabled) {
--		drm_dp_add_payload_part2(mgr, state, payload);
--		msto->enabled = false;
-+	drm_dp_mst_deallocate_vcpi(&mstm->mgr, mstc->port);
-+
-+	msto->mstc = NULL;
-+	msto->disabled = false;
-+}
-+
-+static struct drm_dp_payload *
-+nv50_msto_payload(struct nv50_msto *msto)
-+{
-+	struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-+	struct nv50_mstc *mstc = msto->mstc;
-+	struct nv50_mstm *mstm = mstc->mstm;
-+	int vcpi = mstc->port->vcpi.vcpi, i;
-+
-+	WARN_ON(!mutex_is_locked(&mstm->mgr.payload_lock));
-+
-+	NV_ATOMIC(drm, "%s: vcpi %d\n", msto->encoder.name, vcpi);
-+	for (i = 0; i < mstm->mgr.max_payloads; i++) {
-+		struct drm_dp_payload *payload = &mstm->mgr.payloads[i];
-+		NV_ATOMIC(drm, "%s: %d: vcpi %d start 0x%02x slots 0x%02x\n",
-+			  mstm->outp->base.base.name, i, payload->vcpi,
-+			  payload->start_slot, payload->num_slots);
-+	}
-+
-+	for (i = 0; i < mstm->mgr.max_payloads; i++) {
-+		struct drm_dp_payload *payload = &mstm->mgr.payloads[i];
-+		if (payload->vcpi == vcpi)
-+			return payload;
- 	}
-+
-+	return NULL;
- }
- 
- static void
--nv50_msto_prepare(struct drm_atomic_state *state,
--		  struct drm_dp_mst_topology_state *mst_state,
--		  struct drm_dp_mst_topology_mgr *mgr,
--		  struct nv50_msto *msto)
-+nv50_msto_prepare(struct nv50_msto *msto)
- {
- 	struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
- 	struct nv50_mstc *mstc = msto->mstc;
- 	struct nv50_mstm *mstm = mstc->mstm;
--	struct drm_dp_mst_atomic_payload *payload;
-+	struct drm_dp_payload *payload = NULL;
- 	struct {
- 		struct nv50_disp_mthd_v1 base;
- 		struct nv50_disp_sor_dp_mst_vcpi_v0 vcpi;
-@@ -990,27 +1011,28 @@ nv50_msto_prepare(struct drm_atomic_state *state,
- 			       (0x0100 << msto->head->base.index),
- 	};
- 
-+	mutex_lock(&mstm->mgr.payload_lock);
-+
- 	NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
- 
--	payload = drm_atomic_get_mst_payload_state(mst_state, mstc->port);
-+	if (mstc->port->vcpi.vcpi > 0)
-+		payload = nv50_msto_payload(msto);
- 
--	// TODO: Figure out if we want to do a better job of handling VCPI allocation failures here?
--	if (msto->disabled) {
--		drm_dp_remove_payload(mgr, mst_state, payload);
--	} else {
--		if (msto->enabled)
--			drm_dp_add_payload_part1(mgr, mst_state, payload);
-+	if (payload) {
-+		NV_ATOMIC(drm, "%s: %s: %02x %02x %04x %04x\n",
-+			  msto->encoder.name, msto->head->base.base.name,
-+			  payload->start_slot, payload->num_slots,
-+			  mstc->port->vcpi.pbn, mstc->port->vcpi.aligned_pbn);
- 
--		args.vcpi.start_slot = payload->vc_start_slot;
--		args.vcpi.num_slots = payload->time_slots;
-+		args.vcpi.start_slot = payload->start_slot;
-+		args.vcpi.num_slots = payload->num_slots;
- 		args.vcpi.pbn = payload->pbn;
--		args.vcpi.aligned_pbn = payload->time_slots * mst_state->pbn_div;
--	}
-+	} else {
-+		NV_ATOMIC(drm, "%s: %s: %02x %02x %04x %04x\n",
-+			  msto->encoder.name, msto->head->base.base.name, 0, 0, 0, 0);
-+ 	}
- 
--	NV_ATOMIC(drm, "%s: %s: %02x %02x %04x %04x\n",
--		  msto->encoder.name, msto->head->base.base.name,
--		  args.vcpi.start_slot, args.vcpi.num_slots,
--		  args.vcpi.pbn, args.vcpi.aligned_pbn);
-+	mutex_unlock(&mstm->mgr.payload_lock);
- 
- 	nvif_mthd(&drm->display->disp.object, 0, &args, sizeof(args));
- }
-@@ -1022,7 +1044,6 @@ nv50_msto_atomic_check(struct drm_encoder *encoder,
- {
- 	struct drm_atomic_state *state = crtc_state->state;
- 	struct drm_connector *connector = conn_state->connector;
--	struct drm_dp_mst_topology_state *mst_state;
- 	struct nv50_mstc *mstc = nv50_mstc(connector);
- 	struct nv50_mstm *mstm = mstc->mstm;
- 	struct nv50_head_atom *asyh = nv50_head_atom(crtc_state);
-@@ -1050,18 +1071,8 @@ nv50_msto_atomic_check(struct drm_encoder *encoder,
- 						    false);
- 	}
- 
--	mst_state = drm_atomic_get_mst_topology_state(state, &mstm->mgr);
--	if (IS_ERR(mst_state))
--		return PTR_ERR(mst_state);
--
--	if (!mst_state->pbn_div) {
--		struct nouveau_encoder *outp = mstc->mstm->outp;
--
--		mst_state->pbn_div = drm_dp_get_vc_payload_bw(&mstm->mgr,
--							      outp->dp.link_bw, outp->dp.link_nr);
--	}
--
--	slots = drm_dp_atomic_find_time_slots(state, &mstm->mgr, mstc->port, asyh->dp.pbn);
-+	slots = drm_dp_atomic_find_time_slots(state, &mstm->mgr, mstc->port,
-+					      asyh->dp.pbn, 0);
- 	if (slots < 0)
- 		return slots;
- 
-@@ -1093,6 +1104,7 @@ nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *st
- 	struct drm_connector *connector;
- 	struct drm_connector_list_iter conn_iter;
- 	u8 proto;
-+	bool r;
- 
- 	drm_connector_list_iter_begin(encoder->dev, &conn_iter);
- 	drm_for_each_connector_iter(connector, &conn_iter) {
-@@ -1107,6 +1119,10 @@ nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *st
- 	if (WARN_ON(!mstc))
- 		return;
- 
-+	r = drm_dp_mst_allocate_vcpi(&mstm->mgr, mstc->port, asyh->dp.pbn, asyh->dp.tu);
-+	if (!r)
-+		DRM_DEBUG_KMS("Failed to allocate VCPI\n");
-+
- 	if (!mstm->links++)
- 		nv50_outp_acquire(mstm->outp, false /*XXX: MST audio.*/);
- 
-@@ -1119,7 +1135,6 @@ nv50_msto_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *st
- 			   nv50_dp_bpc_to_depth(asyh->or.bpc));
- 
- 	msto->mstc = mstc;
--	msto->enabled = true;
- 	mstm->modified = true;
- }
- 
-@@ -1130,6 +1145,8 @@ nv50_msto_atomic_disable(struct drm_encoder *encoder, struct drm_atomic_state *s
- 	struct nv50_mstc *mstc = msto->mstc;
- 	struct nv50_mstm *mstm = mstc->mstm;
- 
-+	drm_dp_mst_reset_vcpi_slots(&mstm->mgr, mstc->port);
-+
- 	mstm->outp->update(mstm->outp, msto->head->base.index, NULL, 0, 0);
- 	mstm->modified = true;
- 	if (!--mstm->links)
-@@ -1349,9 +1366,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port,
- }
- 
- static void
--nv50_mstm_cleanup(struct drm_atomic_state *state,
--		  struct drm_dp_mst_topology_state *mst_state,
--		  struct nv50_mstm *mstm)
-+nv50_mstm_cleanup(struct nv50_mstm *mstm)
- {
- 	struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev);
- 	struct drm_encoder *encoder;
-@@ -1359,12 +1374,14 @@ nv50_mstm_cleanup(struct drm_atomic_state *state,
- 	NV_ATOMIC(drm, "%s: mstm cleanup\n", mstm->outp->base.base.name);
- 	drm_dp_check_act_status(&mstm->mgr);
- 
-+	drm_dp_update_payload_part2(&mstm->mgr);
-+
- 	drm_for_each_encoder(encoder, mstm->outp->base.base.dev) {
- 		if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) {
- 			struct nv50_msto *msto = nv50_msto(encoder);
- 			struct nv50_mstc *mstc = msto->mstc;
- 			if (mstc && mstc->mstm == mstm)
--				nv50_msto_cleanup(state, mst_state, &mstm->mgr, msto);
-+				nv50_msto_cleanup(msto);
- 		}
- 	}
- 
-@@ -1372,34 +1389,20 @@ nv50_mstm_cleanup(struct drm_atomic_state *state,
- }
- 
- static void
--nv50_mstm_prepare(struct drm_atomic_state *state,
--		  struct drm_dp_mst_topology_state *mst_state,
--		  struct nv50_mstm *mstm)
-+nv50_mstm_prepare(struct nv50_mstm *mstm)
- {
- 	struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev);
- 	struct drm_encoder *encoder;
- 
- 	NV_ATOMIC(drm, "%s: mstm prepare\n", mstm->outp->base.base.name);
-+	drm_dp_update_payload_part1(&mstm->mgr, 1);
- 
--	/* Disable payloads first */
--	drm_for_each_encoder(encoder, mstm->outp->base.base.dev) {
--		if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) {
--			struct nv50_msto *msto = nv50_msto(encoder);
--			struct nv50_mstc *mstc = msto->mstc;
--			if (mstc && mstc->mstm == mstm && msto->disabled)
--				nv50_msto_prepare(state, mst_state, &mstm->mgr, msto);
--		}
--	}
--
--	/* Add payloads for new heads, while also updating the start slots of any unmodified (but
--	 * active) heads that may have had their VC slots shifted left after the previous step
--	 */
- 	drm_for_each_encoder(encoder, mstm->outp->base.base.dev) {
- 		if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) {
- 			struct nv50_msto *msto = nv50_msto(encoder);
- 			struct nv50_mstc *mstc = msto->mstc;
--			if (mstc && mstc->mstm == mstm && !msto->disabled)
--				nv50_msto_prepare(state, mst_state, &mstm->mgr, msto);
-+			if (mstc && mstc->mstm == mstm)
-+				nv50_msto_prepare(msto);
- 		}
- 	}
- 
-@@ -1596,7 +1599,9 @@ nv50_mstm_new(struct nouveau_encoder *outp, struct drm_dp_aux *aux, int aux_max,
- 	mstm->mgr.cbs = &nv50_mstm;
- 
- 	ret = drm_dp_mst_topology_mgr_init(&mstm->mgr, dev, aux, aux_max,
--					   max_payloads, conn_base_id);
-+					   max_payloads, outp->dcb->dpconf.link_nr,
-+					   drm_dp_bw_code_to_link_rate(outp->dcb->dpconf.link_bw),
-+					   conn_base_id);
- 	if (ret)
- 		return ret;
- 
-@@ -2048,20 +2053,20 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
- static void
- nv50_disp_atomic_commit_core(struct drm_atomic_state *state, u32 *interlock)
- {
--	struct drm_dp_mst_topology_mgr *mgr;
--	struct drm_dp_mst_topology_state *mst_state;
- 	struct nouveau_drm *drm = nouveau_drm(state->dev);
- 	struct nv50_disp *disp = nv50_disp(drm->dev);
- 	struct nv50_core *core = disp->core;
- 	struct nv50_mstm *mstm;
--	int i;
-+	struct drm_encoder *encoder;
- 
- 	NV_ATOMIC(drm, "commit core %08x\n", interlock[NV50_DISP_INTERLOCK_BASE]);
- 
--	for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) {
--		mstm = nv50_mstm(mgr);
--		if (mstm->modified)
--			nv50_mstm_prepare(state, mst_state, mstm);
-+	drm_for_each_encoder(encoder, drm->dev) {
-+		if (encoder->encoder_type != DRM_MODE_ENCODER_DPMST) {
-+			mstm = nouveau_encoder(encoder)->dp.mstm;
-+			if (mstm && mstm->modified)
-+				nv50_mstm_prepare(mstm);
-+		}
- 	}
- 
- 	core->func->ntfy_init(disp->sync, NV50_DISP_CORE_NTFY);
-@@ -2070,10 +2075,12 @@ nv50_disp_atomic_commit_core(struct drm_atomic_state *state, u32 *interlock)
- 				       disp->core->chan.base.device))
- 		NV_ERROR(drm, "core notifier timeout\n");
- 
--	for_each_new_mst_mgr_in_state(state, mgr, mst_state, i) {
--		mstm = nv50_mstm(mgr);
--		if (mstm->modified)
--			nv50_mstm_cleanup(state, mst_state, mstm);
-+	drm_for_each_encoder(encoder, drm->dev) {
-+		if (encoder->encoder_type != DRM_MODE_ENCODER_DPMST) {
-+			mstm = nouveau_encoder(encoder)->dp.mstm;
-+			if (mstm && mstm->modified)
-+				nv50_mstm_cleanup(mstm);
-+		}
- 	}
- }
- 
-diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h
-index 41fd8352ab65..1d2f77835de5 100644
---- a/include/drm/display/drm_dp_mst_helper.h
-+++ b/include/drm/display/drm_dp_mst_helper.h
-@@ -48,6 +48,20 @@ struct drm_dp_mst_topology_ref_history {
- 
- struct drm_dp_mst_branch;
- 
-+/**
-+ * struct drm_dp_vcpi - Virtual Channel Payload Identifier
-+ * @vcpi: Virtual channel ID.
-+ * @pbn: Payload Bandwidth Number for this channel
-+ * @aligned_pbn: PBN aligned with slot size
-+ * @num_slots: number of slots for this PBN
-+ */
-+struct drm_dp_vcpi {
-+	int vcpi;
-+	int pbn;
-+	int aligned_pbn;
-+	int num_slots;
-+};
-+
- /**
-  * struct drm_dp_mst_port - MST port
-  * @port_num: port number
-@@ -131,6 +145,7 @@ struct drm_dp_mst_port {
- 	struct drm_dp_aux *passthrough_aux;
- 	struct drm_dp_mst_branch *parent;
- 
-+	struct drm_dp_vcpi vcpi;
- 	struct drm_connector *connector;
- 	struct drm_dp_mst_topology_mgr *mgr;
- 
-@@ -515,6 +530,20 @@ struct drm_dp_mst_topology_cbs {
- 	void (*poll_hpd_irq)(struct drm_dp_mst_topology_mgr *mgr);
- };
- 
-+#define DP_MAX_PAYLOAD (sizeof(unsigned long) * 8)
-+
-+#define DP_PAYLOAD_LOCAL 1
-+#define DP_PAYLOAD_REMOTE 2
-+#define DP_PAYLOAD_DELETE_LOCAL 3
-+
-+struct drm_dp_payload {
-+	int payload_state;
-+	int start_slot;
-+	int num_slots;
-+	int vcpi;
-+	int pbn;
-+};
-+
- #define to_dp_mst_topology_state(x) container_of(x, struct drm_dp_mst_topology_state, base)
- 
- /**
-@@ -527,34 +556,6 @@ struct drm_dp_mst_atomic_payload {
- 	/** @port: The MST port assigned to this payload */
- 	struct drm_dp_mst_port *port;
- 
--	/**
--	 * @vc_start_slot: The time slot that this payload starts on. Because payload start slots
--	 * can't be determined ahead of time, the contents of this value are UNDEFINED at atomic
--	 * check time. This shouldn't usually matter, as the start slot should never be relevant for
--	 * atomic state computations.
--	 *
--	 * Since this value is determined at commit time instead of check time, this value is
--	 * protected by the MST helpers ensuring that async commits operating on the given topology
--	 * never run in parallel. In the event that a driver does need to read this value (e.g. to
--	 * inform hardware of the starting timeslot for a payload), the driver may either:
--	 *
--	 * * Read this field during the atomic commit after
--	 *   drm_dp_mst_atomic_wait_for_dependencies() has been called, which will ensure the
--	 *   previous MST states payload start slots have been copied over to the new state. Note
--	 *   that a new start slot won't be assigned/removed from this payload until
--	 *   drm_dp_add_payload_part1()/drm_dp_remove_payload() have been called.
--	 * * Acquire the MST modesetting lock, and then wait for any pending MST-related commits to
--	 *   get committed to hardware by calling drm_crtc_commit_wait() on each of the
--	 *   &drm_crtc_commit structs in &drm_dp_mst_topology_state.commit_deps.
--	 *
--	 * If neither of the two above solutions suffice (e.g. the driver needs to read the start
--	 * slot in the middle of an atomic commit without waiting for some reason), then drivers
--	 * should cache this value themselves after changing payloads.
--	 */
--	s8 vc_start_slot;
--
--	/** @vcpi: The Virtual Channel Payload Identifier */
--	u8 vcpi;
- 	/**
- 	 * @time_slots:
- 	 * The number of timeslots allocated to this payload from the source DP Tx to
-@@ -582,6 +583,8 @@ struct drm_dp_mst_topology_state {
- 	/** @base: Base private state for atomic */
- 	struct drm_private_state base;
- 
-+	/** @payloads: The list of payloads being created/destroyed in this state */
-+	struct list_head payloads;
- 	/** @mgr: The topology manager */
- 	struct drm_dp_mst_topology_mgr *mgr;
- 
-@@ -598,21 +601,10 @@ struct drm_dp_mst_topology_state {
- 	/** @num_commit_deps: The number of CRTC commits in @commit_deps */
- 	size_t num_commit_deps;
- 
--	/** @payload_mask: A bitmask of allocated VCPIs, used for VCPI assignments */
--	u32 payload_mask;
--	/** @payloads: The list of payloads being created/destroyed in this state */
--	struct list_head payloads;
--
- 	/** @total_avail_slots: The total number of slots this topology can handle (63 or 64) */
- 	u8 total_avail_slots;
- 	/** @start_slot: The first usable time slot in this topology (1 or 0) */
- 	u8 start_slot;
--
--	/**
--	 * @pbn_div: The current PBN divisor for this topology. The driver is expected to fill this
--	 * out itself.
--	 */
--	int pbn_div;
- };
- 
- #define to_dp_mst_topology_mgr(x) container_of(x, struct drm_dp_mst_topology_mgr, base)
-@@ -652,6 +644,14 @@ struct drm_dp_mst_topology_mgr {
- 	 * @max_payloads: maximum number of payloads the GPU can generate.
- 	 */
- 	int max_payloads;
-+	/**
-+	 * @max_lane_count: maximum number of lanes the GPU can drive.
-+	 */
-+	int max_lane_count;
-+	/**
-+	 * @max_link_rate: maximum link rate per lane GPU can output, in kHz.
-+	 */
-+	int max_link_rate;
- 	/**
- 	 * @conn_base_id: DRM connector ID this mgr is connected to. Only used
- 	 * to build the MST connector path value.
-@@ -694,20 +694,6 @@ struct drm_dp_mst_topology_mgr {
- 	 */
- 	bool payload_id_table_cleared : 1;
- 
--	/**
--	 * @payload_count: The number of currently active payloads in hardware. This value is only
--	 * intended to be used internally by MST helpers for payload tracking, and is only safe to
--	 * read/write from the atomic commit (not check) context.
--	 */
--	u8 payload_count;
--
--	/**
--	 * @next_start_slot: The starting timeslot to use for new VC payloads. This value is used
--	 * internally by MST helpers for payload tracking, and is only safe to read/write from the
--	 * atomic commit (not check) context.
--	 */
--	u8 next_start_slot;
--
- 	/**
- 	 * @mst_primary: Pointer to the primary/first branch device.
- 	 */
-@@ -721,6 +707,10 @@ struct drm_dp_mst_topology_mgr {
- 	 * @sink_count: Sink count from DEVICE_SERVICE_IRQ_VECTOR_ESI0.
- 	 */
- 	u8 sink_count;
-+	/**
-+	 * @pbn_div: PBN to slots divisor.
-+	 */
-+	int pbn_div;
- 
- 	/**
- 	 * @funcs: Atomic helper callbacks
-@@ -737,6 +727,32 @@ struct drm_dp_mst_topology_mgr {
- 	 */
- 	struct list_head tx_msg_downq;
- 
-+	/**
-+	 * @payload_lock: Protect payload information.
-+	 */
-+	struct mutex payload_lock;
-+	/**
-+	 * @proposed_vcpis: Array of pointers for the new VCPI allocation. The
-+	 * VCPI structure itself is &drm_dp_mst_port.vcpi, and the size of
-+	 * this array is determined by @max_payloads.
-+	 */
-+	struct drm_dp_vcpi **proposed_vcpis;
-+	/**
-+	 * @payloads: Array of payloads. The size of this array is determined
-+	 * by @max_payloads.
-+	 */
-+	struct drm_dp_payload *payloads;
-+	/**
-+	 * @payload_mask: Elements of @payloads actually in use. Since
-+	 * reallocation of active outputs isn't possible gaps can be created by
-+	 * disabling outputs out of order compared to how they've been enabled.
-+	 */
-+	unsigned long payload_mask;
-+	/**
-+	 * @vcpi_mask: Similar to @payload_mask, but for @proposed_vcpis.
-+	 */
-+	unsigned long vcpi_mask;
-+
- 	/**
- 	 * @tx_waitq: Wait to queue stall for the tx worker.
- 	 */
-@@ -808,7 +824,9 @@ struct drm_dp_mst_topology_mgr {
- int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
- 				 struct drm_device *dev, struct drm_dp_aux *aux,
- 				 int max_dpcd_transaction_bytes,
--				 int max_payloads, int conn_base_id);
-+				 int max_payloads,
-+				 int max_lane_count, int max_link_rate,
-+				 int conn_base_id);
- 
- void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr);
- 
-@@ -831,17 +849,28 @@ int drm_dp_get_vc_payload_bw(const struct drm_dp_mst_topology_mgr *mgr,
- 
- int drm_dp_calc_pbn_mode(int clock, int bpp, bool dsc);
- 
-+bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
-+			      struct drm_dp_mst_port *port, int pbn, int slots);
-+
-+int drm_dp_mst_get_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
-+
-+
-+void drm_dp_mst_reset_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);
-+
- void drm_dp_mst_update_slots(struct drm_dp_mst_topology_state *mst_state, uint8_t link_encoding_cap);
- 
--int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
--			     struct drm_dp_mst_topology_state *mst_state,
--			     struct drm_dp_mst_atomic_payload *payload);
--int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
--			     struct drm_atomic_state *state,
--			     struct drm_dp_mst_atomic_payload *payload);
--void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
--			   struct drm_dp_mst_topology_state *mst_state,
--			   struct drm_dp_mst_atomic_payload *payload);
-+void drm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
-+				struct drm_dp_mst_port *port);
-+
-+
-+int drm_dp_find_vcpi_slots(struct drm_dp_mst_topology_mgr *mgr,
-+			   int pbn);
-+
-+
-+int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr, int start_slot);
-+
-+
-+int drm_dp_update_payload_part2(struct drm_dp_mst_topology_mgr *mgr);
- 
- int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);
- 
-@@ -863,22 +892,17 @@ int drm_dp_mst_connector_late_register(struct drm_connector *connector,
- void drm_dp_mst_connector_early_unregister(struct drm_connector *connector,
- 					   struct drm_dp_mst_port *port);
- 
--struct drm_dp_mst_topology_state *
--drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
--				  struct drm_dp_mst_topology_mgr *mgr);
--struct drm_dp_mst_topology_state *
--drm_atomic_get_new_mst_topology_state(struct drm_atomic_state *state,
--				      struct drm_dp_mst_topology_mgr *mgr);
--struct drm_dp_mst_atomic_payload *
--drm_atomic_get_mst_payload_state(struct drm_dp_mst_topology_state *state,
--				 struct drm_dp_mst_port *port);
-+struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
-+								    struct drm_dp_mst_topology_mgr *mgr);
- int __must_check
- drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,
- 			      struct drm_dp_mst_topology_mgr *mgr,
--			      struct drm_dp_mst_port *port, int pbn);
-+			      struct drm_dp_mst_port *port, int pbn,
-+			      int pbn_div);
- int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_state *state,
- 				 struct drm_dp_mst_port *port,
--				 int pbn, bool enable);
-+				 int pbn, int pbn_div,
-+				 bool enable);
- int __must_check
- drm_dp_mst_add_affected_dsc_crtcs(struct drm_atomic_state *state,
- 				  struct drm_dp_mst_topology_mgr *mgr);
-@@ -902,12 +926,6 @@ void drm_dp_mst_put_port_malloc(struct drm_dp_mst_port *port);
- 
- struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port(struct drm_dp_mst_port *port);
- 
--static inline struct drm_dp_mst_topology_state *
--to_drm_dp_mst_topology_state(struct drm_private_state *state)
--{
--	return container_of(state, struct drm_dp_mst_topology_state, base);
--}
--
- extern const struct drm_private_state_funcs drm_dp_mst_topology_state_funcs;
- 
- /**
--- 
-2.39.0
-
diff --git a/libre/linux-libre/0003-fix-mvsdio-eMMC-timing.patch b/libre/linux-libre/0003-fix-mvsdio-eMMC-timing.patch
index a494c2d5c..a447eaa49 100644
--- a/libre/linux-libre/0003-fix-mvsdio-eMMC-timing.patch
+++ b/libre/linux-libre/0003-fix-mvsdio-eMMC-timing.patch
@@ -1,4 +1,4 @@
-From e8da1680d0273aaca806c23a10b4f3467a6b4f96 Mon Sep 17 00:00:00 2001
+From 5b76d7e549a6f65f881ef832cb39ae6a4ad34119 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
 Subject: [PATCH 3/7] fix mvsdio eMMC timing
@@ -34,5 +34,5 @@ index 629efbe639c4..c507c064736c 100644
  		host->clock = ios->clock;
  		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.35.1
+2.37.0
 
diff --git a/libre/linux-libre/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/libre/linux-libre/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index fd99811bc..b487155b1 100644
--- a/libre/linux-libre/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/libre/linux-libre/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,4 +1,4 @@
-From f0eaedee0904275b2ed55b383dba794d53fac17d Mon Sep 17 00:00:00 2001
+From 824cc151d839ce92269200119f9148013755adb8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
 Subject: [PATCH 4/7] net/smsc95xx: Allow mac address to be set as a parameter
@@ -8,18 +8,18 @@ Subject: [PATCH 4/7] net/smsc95xx: Allow mac address to be set as a parameter
  1 file changed, 56 insertions(+)
 
 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index bc1e3dd67c04..51ae8e6fec4e 100644
+index bfb58c91db04..29b7c4cb90f1 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
-@@ -50,6 +50,7 @@
+@@ -54,6 +54,7 @@
  #define SUSPEND_SUSPEND3		(0x08)
  #define SUSPEND_ALLMODES		(SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
  					 SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
 +#define MAC_ADDR_LEN                    (6)
  
- struct smsc95xx_priv {
- 	u32 mac_cr;
-@@ -67,6 +68,10 @@ static bool turbo_mode = true;
+ #define SMSC95XX_NR_IRQS		(1) /* raise to 12 for GPIOs */
+ #define PHY_HWIRQ			(SMSC95XX_NR_IRQS - 1)
+@@ -78,6 +79,10 @@ static bool turbo_mode = true;
  module_param(turbo_mode, bool, 0644);
  MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
  
@@ -27,10 +27,10 @@ index bc1e3dd67c04..51ae8e6fec4e 100644
 +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)
+ static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
+ 					  u32 *data)
  {
-@@ -753,8 +758,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+@@ -761,8 +766,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
  	return phy_mii_ioctl(netdev->phydev, rq, cmd);
  }
  
@@ -91,5 +91,5 @@ index bc1e3dd67c04..51ae8e6fec4e 100644
  
  	/* maybe the boot loader passed the MAC address in devicetree */
 -- 
-2.35.1
+2.37.0
 
diff --git a/libre/linux-libre/0005-set-default-cubietruck-led-triggers.patch b/libre/linux-libre/0005-set-default-cubietruck-led-triggers.patch
index f09051572..76796e291 100644
--- a/libre/linux-libre/0005-set-default-cubietruck-led-triggers.patch
+++ b/libre/linux-libre/0005-set-default-cubietruck-led-triggers.patch
@@ -1,4 +1,4 @@
-From 363e156344b831978306bf95dac7859dafe61d14 Mon Sep 17 00:00:00 2001
+From 3a5136fec1bdb0f7a5ca614dab47c55c3177d26a Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
 Subject: [PATCH 5/7] set default cubietruck led triggers
@@ -29,5 +29,5 @@ index 52160e368304..21c8ef94c756 100644
  	};
  
 -- 
-2.35.1
+2.37.0
 
diff --git a/libre/linux-libre/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/libre/linux-libre/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
index 319015242..4d19cce36 100644
--- a/libre/linux-libre/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+++ b/libre/linux-libre/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
@@ -1,4 +1,4 @@
-From b4dcf8b9c59c451b667f7cc3f20e7fe837951517 Mon Sep 17 00:00:00 2001
+From c87c82c5a03baf1202d22567e4f6d113cfe17bad Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 11 Aug 2016 00:42:37 -0600
 Subject: [PATCH 6/7] exynos4412-odroid: set higher minimum buck2 regulator
@@ -13,7 +13,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-index 5b1d4591b35c..8a8d2c6add10 100644
+index e7669b9e9edb..a1b4e182717f 100644
 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 @@ -436,7 +436,7 @@ buck1_reg: BUCK1 {
@@ -26,5 +26,5 @@ index 5b1d4591b35c..8a8d2c6add10 100644
  				regulator-always-on;
  				regulator-boot-on;
 -- 
-2.35.1
+2.37.0
 
diff --git a/libre/linux-libre/0007-USB-Armory-MkII-support.patch b/libre/linux-libre/0007-USB-Armory-MkII-support.patch
index 711d50d6d..3d5233671 100644
--- a/libre/linux-libre/0007-USB-Armory-MkII-support.patch
+++ b/libre/linux-libre/0007-USB-Armory-MkII-support.patch
@@ -1,4 +1,4 @@
-From 915405b2da517ee56a07e57230273ab2ff4e522d Mon Sep 17 00:00:00 2001
+From 23e406e404f935be33c917ca7772466dd52582c3 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 11 Aug 2019 12:34:17 -0600
 Subject: [PATCH 7/7] USB Armory MkII support
@@ -12,21 +12,21 @@ Subject: [PATCH 7/7] USB Armory MkII support
  create mode 100644 arch/arm/boot/dts/imx6ull-usbarmory.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 235ad559acb2..ca79830160bd 100644
+index 05d8aef6e5d2..c6c76fa5047f 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -694,6 +694,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
+@@ -722,6 +722,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
  	imx6ul-tx6ul-0010.dtb \
  	imx6ul-tx6ul-0011.dtb \
  	imx6ul-tx6ul-mainboard.dtb \
 +	imx6ul-usbarmory.dtb \
  	imx6ull-14x14-evk.dtb \
- 	imx6ull-colibri-emmc-eval-v3.dtb \
- 	imx6ull-colibri-eval-v3.dtb \
-@@ -704,6 +705,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
- 	imx6ull-phytec-segin-ff-rdk-nand.dtb \
- 	imx6ull-phytec-segin-ff-rdk-emmc.dtb \
- 	imx6ull-phytec-segin-lc-rdk-nand.dtb \
+ 	imx6ull-colibri-aster.dtb \
+ 	imx6ull-colibri-emmc-aster.dtb \
+@@ -745,6 +746,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
+ 	imx6ull-phytec-tauri-nand.dtb \
+ 	imx6ull-tqma6ull2-mba6ulx.dtb \
+ 	imx6ull-tqma6ull2l-mba6ulx.dtb \
 +	imx6ull-usbarmory.dtb \
  	imx6ulz-14x14-evk.dtb \
  	imx6ulz-bsh-smm-m2.dtb
@@ -557,5 +557,5 @@ index 000000000000..f74d0296d5f6
 +	status = "okay";
 +};
 -- 
-2.35.1
+2.37.0
 
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 082a3a6f2..a06752fa0 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -14,7 +14,7 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix
 _replacesoldmodules=() # '%' gets replaced with kernel suffix
 
 pkgbase=linux-libre
-pkgver=6.1.5
+pkgver=6.3.3
 pkgrel=1
 pkgdesc='Linux-libre'
 rcnver=5.18.12
@@ -23,12 +23,26 @@ url='https://linux-libre.fsfla.org/'
 arch=(i686 x86_64 armv7h)
 license=(GPL2)
 makedepends=(
-  bc libelf pahole cpio perl tar xz
-  xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra
+  bc
+  cpio
+  gettext
+  git
+  libelf
+  pahole
+  perl
+  tar
+  xz
+
+  # htmldocs
+  graphviz
+  imagemagick
+  python-sphinx
+  texlive-latexextra
+  xmlto
 )
 makedepends_armv7h=(uboot-tools vboot-utils dtc) # required by linux-libre-chromebook
 options=('!strip')
-_srcname=linux-6.1
+_srcname=linux-6.3
 source=(
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign}
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/patch-${_srcname##*-}-gnu-$pkgver-gnu.xz"{,.sign}
@@ -46,8 +60,7 @@ source=(
   0002-fix-Atmel-maXTouch-touchscreen-support.patch
   # Arch Linux patches
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  0002-docs-Fix-the-docs-build-with-Sphinx-6.0.patch
-  0003-Revert-drm-display-dp_mst-Move-all-payload-info-into.patch
+  0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch
 )
 source_i686=(
   # avoid using zstd compression in ultra mode (exhausts virtual memory)
@@ -55,7 +68,7 @@ source_i686=(
 )
 source_armv7h=(
   # RCN patch (CM3 firmware deblobbed and bloatware removed)
-  "https://repo.parabola.nu/other/rcn-libre/patches/$rcnver/rcn-libre-$rcnver-$rcnrel.patch"{,.sig}
+  #"https://repo.parabola.nu/other/rcn-libre/patches/$rcnver/rcn-libre-$rcnver-$rcnrel.patch"{,.sig}
   # Arch Linux ARM patches
   0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
   0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -64,46 +77,44 @@ source_armv7h=(
   0005-set-default-cubietruck-led-triggers.patch
   0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
   0007-USB-Armory-MkII-support.patch
-  # ChromiumOS patches
+  # ChromiumOS patch
+  # https://labs.parabola.nu/issues/2372
   0001-CHROMIUM-block-partitions-efi-Add-support-for-IGNORE.patch
 )
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
   '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
 )
-sha512sums=('1791227e4eef3be119fcbdbf3c8d441ae77badb6565c4b918130328fa24711b09128d4aabb26cd2adf453726bcb4b30b8c5199794114050835e3875bea169224'
-            'SKIP'
-            '309ce36c543c30fe2211368ea566d143b6b6fc766e509c3c0e9884618e9e71428f22d532dd8448a73c54d741795194afe4a04e6b2a5fccfd7de1f7fd5ad89f9d'
-            'SKIP'
-            '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
-            'SKIP'
-            '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
-            'SKIP'
-            '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'
-            'SKIP'
-            '21c65d7466740b30f060863732e2e80bcb451b15a8d4005015eb0cab87522b5c267c71815ac5f7cdf0394f39157b16b6d223a13cd30df2b6ae7092efd4ba26bf'
-            '092654fbb1b9f6c6d4eb16ada303b0d34874c65f9ca845b1c1a7c741ee972573a5ec52848bd08969a82c9f74105af674707c8bb7c44b00d84b6413f5342c695a'
-            '47d16ffc94510d4a8773146a46cfb35aca8cfdae38d17283334cd62d92de36250fbec90e9892357033398ecc7d970127b1a41b703a8372972422ca4af7c90c70'
-            '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b'
-            'f10af02f0cb2d31259d9633e1ba845f555f525789f750fc2ddc51bd18c5ff64fcdd242dae801623887f5ce5cdb5528bce890459f0fab9fd31a28868bb7f6bba5'
-            'bb6718984a7357c9b00c37e4788480e5b8b75018c172ecc1441bc3fc5d2d42444eb5d8c7f9d2e3a7d6fed6d03acb565e3c0559486e494c40a7fe6bd0570c9ede'
-            '143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232'
-            '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
-            'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '5640d6f9226ef6c172a4d0b74fd32f2e3ad5b3fca8c75d1f07fe83c083aadc7d59273823b77d9d75a5539ec16bb7d4aba32e58bda991144d2773a7fad6848841'
-            'ab6bf4664911dbe526dc611d53f9d2ba1a84d96ddb38befaa1b3bfad60e4371c2229cb620612894b28af29562494eedf8e3f63a792d2a63e33a3b8cd0076b000'
-            'f74f8c6a6a6fe4159fc03f0ae8f12f661ee39e918d8a3a1abbd6d35538bab6807b5413136f032ac617e2882a71db9969fb14fe23c31a20d236350825ddfb5876')
-sha512sums_i686=('bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85')
-sha512sums_armv7h=('94c6243d23bc995dec3edcb1dd5cc7d5e7d30fec70fc32b9be5f3e7d934da7035e9152fea3cce58a53b0f35f29060bdef2a3a2dac3c46f520adf1088897362f9'
-                   'SKIP'
-                   '8da996a42249672893fa532ccbd096347580a0dc1698c45e9c865646e2765789553b1bb42793e721de30aea70340fdc116d2e4a50580fef999ca5fc627aaf4c3'
-                   '0e6ddc24011d77a2e422b642c4507317fc2d26b20f5649818a2f11acac165ccab2cf2e64ab50d44ce7affcfe12c2ef5158790e499058831e7995400b2087df78'
-                   '5d2f228151148358b07744a9c09cf6e2420c4284735d4ce7dc925a1deb3970298cc95dd766ee13e094e2853847b016c3ebc2d61bb423e370b4bc33938367ebda'
-                   'a206c3dc678839831d72eefee997cbe1bb877af7f6f90dfe5cab0bd7d9686a3b13a2aba74c8fbe5533872e12306ac9ea1b5eede18ef3cf10b8d01361afd67e9c'
-                   'a1072dd808c63592178cc01ea3c36de946f277fb451b13c34f51a5ac134cde4a8a4d57487132af1c6d7b5820842cdda9dc4edb3da85d33bd02bf87a032c3263a'
-                   '85b2e16a930b8066990c42f973d386dc3c6d62fdf3d1289bbb51df3df296c26f30051162fba49a42d38f71f05de926aa8c065097f14bd8e9f8e28a52949ead00'
-                   '2e99582d8b670b6c6b27add14b60e957cbcf9cd6aae40491bd9dea6ac455c0ade0bbee21e3bdfb5e06ce83ad27c5a788404b05bf7ac93831ca18d2e60a67017c'
-                   '5b77c587cf2ffb60acf1d9eb43330983548c7e81a53e0ffd2b04962a99441a0000d631ff77c245c7062afc2c8368d996a2456496d42dcb658f330e5083e5e029')
+b2sums=('03c5869a2b432207208d002a3a8b55f42751dc2b50642fcd9ca982cc8da05c7965d359202e49e1418b0ff74307fdeb91d9f41f3293815bc4e508a43104ec1e92'
+        'SKIP'
+        'cff40934db0b5da1624718bab083fc7e99418ee1f134fbb5d52f47927e32198fdc5117d1e8464dc86f504ce8dc1ad924dff6eb87f7cf844ef7b35861aa2a40c8'
+        'SKIP'
+        '73fee2ae5cb1ffd3e6584e56da86a8b1ff6c713aae54d77c0dab113890fc673dc5f300eb9ed93fb367b045ece8fa80304ff277fe61665eccf7b7ce24f0c045eb'
+        'SKIP'
+        'd02a1153a4285b32c774dca4560fe37907ccf30b8e487a681b717ed95ae9bed5988875c0a118938e5885ae9d2857e53a6f216b732b6fa3368e3c5fe08c86382c'
+        'SKIP'
+        '580911af9431c066bbc072fd22d5e2ef65f12d8358cec5ff5a4f1b7deebb86cef6b5c1ad631f42350af72c51d44d2093c71f761234fb224a8b9dbb3b64b8201d'
+        'SKIP'
+        '84f65302f45c83e28cb5204a9b6fcbf652dab3d535702b1fd84ff8af973de7e8edbe92ce58052c10c8bf4414856205785a88d76ac76eb524e36b7644d3f1f226'
+        'aeb684b13d3ea869996f7af04211f2c35398441532ff8238885cb5ebd1c4ff22c6afaaf8d18794626af77d85345e7d8c89658504faed70afe634acc44be926e0'
+        '5760e0879cf71dfc1c9bdd557829f28437909e701fa566cc3575a52785c81ac70d634ec929833ac01aea111bbae6ba402add738dc86623b32bcc3b523d43f60f'
+        'af69176b1117b94e56b043e97b0bd5873a2974a6a2fd52b102d0ffdca440ff68cfb241d6c4d4ef453cc8c220c236b739bad232e53fd500ce7672fa6e5ba87383'
+        'f2d309c1d0a347539a8095223085691a9be228934b2258feb4872784f6cf6c2cc741426e4e755d63128ee57c284eddb13e0c719d4b5f8e101722e4cca4eb3ad5'
+        'eeed12b2ab60c3d3aad598a1d44b4f23560d818e8fe1ef143f857c8e176652df53501b192ade7d4d915d425fff818b2a232d46bae0d3a0f46b8959e614e0ede2'
+        'aaa4e28a31967cc3a7fe25a86ba35fdfa210cd8b1a9cc96298349cbf01d60cdf146ee519d6803d05b175873f1b3367e47194a178db7ed97c802e59b38f8c303c'
+        'c2214154c36900e311531bfe68184f31639f5c50fed23bc3803a7f18439b7ff258552a39f02fed0ea92f10744e17a6c55cef0ef1a98187f978fe480fb3dddc14'
+        '0c7ceba7cd90087db3296610a07886f337910bad265a32c052d3a703e6eb8e53f355ab9948d72d366408d968d8ee7435084dd89bef5ed0b69355fd884c2cd468'
+        '25b35ceabee03a287f21e7de5907fa760ad63e2e5125ee2c42fb8e4427c5fca1bd62be0bef32a1d46b649b513bb3f892337cc1413768440fe9e9613c51d0f8e3'
+        '9c7f23cc063ab6c8878e2785bf415320df1e41687db3e35e99286416d59f4c923b1a8bcf6cd0e51d9e689b063c49451bb765d18b47b9139990c8f5b01710783b')
+b2sums_i686=('165ab9dd8cedeaae5327accc1581c19cf0be55f923b03feb889cad3351b74c7c4cd3d3c206938e5152bfe1d947513dea8f630f8f5544099ec13d16d254725c40')
+b2sums_armv7h=('73ecc5862c6b4aef7b163c1992004273fbf791b82c75a8602e3def311f682f2b866124c0bfde90d03c7c76bb8b5853bdb9daad6ee2ab0908f4145cda476b8286'
+               '15f7b70b5d153e9336006aba873a78f94d91b8df5e1939041f12e678bb9cfbdda2e362001068a07c044ce606cf0d4d2e625002df9c569c914f7ac248d4d3e8ad'
+               '6219cec826bc543000ab87cf35dcc713f0635519cf79e75888b213a5e2d1f728e59e70df7fd842dda6e40494bf9cafa9f87368cb75b338c5a157a0adcf583512'
+               '66d6cff292962c4c8bbea62b2240c4c53c0c514f9e99864be9244cb846c505e1bedd800ca1347b80883543035d20573b06796e5bacbace6e829880695ffca781'
+               'e1d0949abbde146d68cddab53944c0391210fb4ac632a78788ec729dea834cb82698c8beef203608eee5323a07ecd566b9813552498e9ac659942060713c4549'
+               '56fdf81b439b6b94e63acfb18d61f90298dc4e29fc65efd4dcf41ae950e87f287f48b42b2be15f4ea0cf7a6d39df3c0ef882cf37b2474e91cc2985fb6cdd1089'
+               'd00505c1ac57fd4b53bdb0d9a2172168a23d6082111695c679aeae58e8e749f5b2ef27ce1bc47b0d5fdd81fac792c57d9b45f125a3315b64297b146f727ac467'
+               '741ad7ffc9e8200657315fc4111066b2477cde35ecdc5e73976457f17106f80d148d86bf97b92c523fef1cc5a26ddb867d16330f592f2aa4d886be596bedc8df')
 
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}")
 _replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}")
@@ -118,6 +129,11 @@ export KBUILD_BUILD_HOST=parabola
 export KBUILD_BUILD_USER=$pkgbase
 export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
+_make() {
+  test -s version
+  make KERNELRELEASE="$(<version)" "$@"
+}
+
 prepare() {
   cd $_srcname
 
@@ -131,9 +147,11 @@ prepare() {
     ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
 
   echo "Setting version..."
-  scripts/setlocalversion --save-scmversion
   echo "-$pkgrel" > localversion.10-pkgrel
   echo "${pkgbase#linux-libre}" > localversion.20-pkgname
+  make defconfig
+  make -s kernelrelease > version
+  make mrproper
 
   if [ "$CARCH" = "armv7h" ]; then
     local src_armv7h
@@ -168,43 +186,54 @@ prepare() {
 
   echo "Setting config..."
   cp ../config.$CARCH .config
-  make olddefconfig
+  _make olddefconfig
   diff -u ../config.$CARCH .config || :
 
-  make -s kernelrelease > version
   echo "Prepared $pkgbase version $(<version)"
 }
 
 build() {
   cd $_srcname
-  make htmldocs all
+  _make htmldocs all
 }
 
 _package() {
   pkgdesc="The $pkgdesc kernel and modules"
-  depends=(coreutils kmod initramfs)
-  optdepends=('wireless-regdb: to set the correct wireless channels of your country'
-              'linux-libre-firmware: firmware images needed for some devices')
-  provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE)
-  replaces=(virtualbox-guest-modules-arch wireguard-arch)
+  depends=(
+    coreutils
+    initramfs
+    kmod
+  )
+  optdepends=(
+    'wireless-regdb: to set the correct wireless channels of your country'
+    'linux-libre-firmware: firmware images needed for some devices'
+  )
+  provides=(
+    KSMBD-MODULE
+    VIRTUALBOX-GUEST-MODULES
+    WIREGUARD-MODULE
+  )
+  replaces=(
+    virtualbox-guest-modules-arch
+    wireguard-arch
+  )
   provides+=("${_replacesarchkernel[@]/%/=$pkgver}" "LINUX-ABI_VERSION=$pkgver")
   conflicts+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   replaces+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
 
   cd $_srcname
-  local kernver="$(<version)"
-  local modulesdir="$pkgdir/usr/lib/modules/$kernver"
+  local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
 
   echo "Installing boot image..."
   # systemd expects to find the kernel here to allow hibernation
   # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
-  install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
+  install -Dm644 "$(_make -s image_name)" "$modulesdir/vmlinuz"
 
   # Used by mkinitcpio to name the kernel
   echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
 
   echo "Installing modules..."
-  make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
+  _make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
     DEPMOD=/doesnt/exist modules_install  # Suppress depmod
 
   # remove build and source links
@@ -212,12 +241,12 @@ _package() {
 
   if [ "$CARCH" = "armv7h" ]; then
     echo "Installing device tree binaries..."
-    make INSTALL_DTBS_PATH="$pkgdir/boot/dtbs/$pkgbase" dtbs_install
+    _make INSTALL_DTBS_PATH="$pkgdir/boot/dtbs/$pkgbase" dtbs_install
 
-    # armv7h presets only work with ALL_kver=$kernver
+    # armv7h presets only work with ALL_kver=$(<version)
     backup=("etc/mkinitcpio.d/$pkgbase.preset")
     echo "Installing mkinitcpio preset..."
-    sed "s|%PKGBASE%|$pkgbase|g;s|%KERNVER%|$kernver|g" ../linux-armv7h.preset \
+    sed "s|%PKGBASE%|$pkgbase|g;s|%KERNVER%|$(<version)|g" ../linux-armv7h.preset \
       | install -Dm644 /dev/stdin "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset"
   fi
 }
@@ -367,7 +396,11 @@ _package-chromebook() {
   cp vmlinux.kpart "$pkgdir/boot"
 }
 
-pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs")
+pkgname=(
+  "$pkgbase"
+  "$pkgbase-headers"
+  "$pkgbase-docs"
+)
 [ "$CARCH" = "armv7h" ] && pkgname+=("$pkgbase-chromebook")
 for _p in "${pkgname[@]}"; do
   eval "package_$_p() {
diff --git a/libre/linux-libre/config.armv7h b/libre/linux-libre/config.armv7h
index a571a9953..1ac01a14b 100644
--- a/libre/linux-libre/config.armv7h
+++ b/libre/linux-libre/config.armv7h
@@ -1,20 +1,23 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.17.8-gnu Kernel Configuration
+# Linux/arm 6.3.3-gnu Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230429"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110200
+CONFIG_GCC_VERSION=130101
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23700
+CONFIG_AS_VERSION=24000
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23800
+CONFIG_LD_VERSION=24000
 CONFIG_LLD_VERSION=0
-CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_PAHOLE_VERSION=125
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -40,7 +43,6 @@ CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_INIT=""
 CONFIG_DEFAULT_HOSTNAME="parabola"
-CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -68,7 +70,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
 CONFIG_GENERIC_IRQ_IPI=y
 CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -79,6 +80,8 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_CONTEXT_TRACKING=y
+CONFIG_CONTEXT_TRACKING_IDLE=y
 
 #
 # Timers subsystem
@@ -140,6 +143,7 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
+CONFIG_NEED_SRCU_NMI_SAFE=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
@@ -163,10 +167,12 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 # end of Scheduler features
 
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
+CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
+# CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
@@ -174,6 +180,7 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
+CONFIG_SCHED_MM_CID=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
@@ -207,9 +214,13 @@ CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_ZSTD=y
 CONFIG_BOOT_CONFIG=y
+# CONFIG_BOOT_CONFIG_FORCE is not set
+# CONFIG_BOOT_CONFIG_EMBED is not set
+CONFIG_INITRAMFS_PRESERVE_MTIME=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_LD_ORPHAN_WARN=y
+CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
 CONFIG_SYSCTL=y
 CONFIG_HAVE_UID16=y
 CONFIG_EXPERT=y
@@ -235,9 +246,9 @@ CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_KCMP=y
 CONFIG_RSEQ=y
@@ -254,23 +265,12 @@ 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 is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_SLAB_FREELIST_HARDENED=y
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 # end of General setup
 
 CONFIG_ARM=y
-CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_ARM_HAS_GROUP_RELOCS=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -295,18 +295,9 @@ CONFIG_MMU=y
 CONFIG_ARCH_MMAP_RND_BITS_MIN=8
 CONFIG_ARCH_MMAP_RND_BITS_MAX=16
 CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C24XX is not set
-# CONFIG_ARCH_OMAP1 is not set
 
 #
-# Multiple platform selection
+# Platform selection
 #
 
 #
@@ -315,9 +306,10 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_MULTI_V6 is not set
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
-# end of Multiple platform selection
+# end of Platform selection
 
 # CONFIG_ARCH_VIRT is not set
+# CONFIG_ARCH_AIROHA is not set
 # CONFIG_ARCH_ACTIONS is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_ARTPEC is not set
@@ -345,10 +337,15 @@ CONFIG_ARCH_BCM=y
 #
 CONFIG_ARCH_BCM2835=y
 # CONFIG_ARCH_BCM_53573 is not set
-# CONFIG_ARCH_BCM_63XX is not set
 # CONFIG_ARCH_BRCMSTB is not set
+# CONFIG_ARCH_BCMBCA is not set
+
+#
+# BCMBCA sub platforms
+#
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_DIGICOLOR is not set
+# CONFIG_ARCH_DOVE is not set
 CONFIG_ARCH_EXYNOS=y
 CONFIG_S5P_DEV_MFC=y
 # CONFIG_ARCH_EXYNOS3 is not set
@@ -369,6 +366,7 @@ CONFIG_EXYNOS_MCPM=y
 CONFIG_EXYNOS_CPU_SUSPEND=y
 # CONFIG_ARCH_HIGHBANK is not set
 # CONFIG_ARCH_HISI is not set
+# CONFIG_ARCH_HPE is not set
 CONFIG_ARCH_MXC=y
 CONFIG_MXC_TZIC=y
 CONFIG_HAVE_IMX_ANATOP=y
@@ -421,22 +419,6 @@ CONFIG_MACH_ARMADA_39X=y
 CONFIG_ARCH_OMAP=y
 
 #
-# TI OMAP Common Features
-#
-
-#
-# OMAP Feature Selections
-#
-CONFIG_POWER_AVS_OMAP=y
-CONFIG_POWER_AVS_OMAP_CLASS3=y
-CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_32K_TIMER=y
-# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
-# end of TI OMAP Common Features
-
-CONFIG_MACH_OMAP_GENERIC=y
-
-#
 # TI OMAP/AM/DM/DRA Family
 #
 CONFIG_OMAP_HWMOD=y
@@ -455,12 +437,16 @@ CONFIG_OMAP_INTERCONNECT_BARRIER=y
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_SOC_HAS_OMAP2_SDRC=y
 CONFIG_SOC_HAS_REALTIME_COUNTER=y
+CONFIG_POWER_AVS_OMAP=y
+CONFIG_POWER_AVS_OMAP_CLASS3=y
+# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
 
 #
 # OMAP Legacy Platform Data Board Type
 #
+CONFIG_MACH_OMAP_GENERIC=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 # end of TI OMAP2/3/4 Specific Features
 
@@ -470,7 +456,6 @@ CONFIG_OMAP5_ERRATA_801819=y
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_RDA is not set
 # CONFIG_ARCH_REALTEK is not set
-# CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_RENESAS is not set
@@ -479,6 +464,7 @@ CONFIG_ARCH_INTEL_SOCFPGA=y
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
 # CONFIG_ARCH_STM32 is not set
+# CONFIG_ARCH_SUNPLUS is not set
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_MACH_SUN5I=y
@@ -490,6 +476,7 @@ CONFIG_ARCH_SUNXI_MC_SMP=y
 CONFIG_ARCH_TEGRA=y
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_ARCH_VEXPRESS_DCSCB=y
@@ -525,6 +512,7 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
+CONFIG_CPU_LITTLE_ENDIAN=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set
@@ -549,7 +537,6 @@ CONFIG_ARM_L1_CACHE_SHIFT_6=y
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARM_HEAVY_MB=y
-CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 CONFIG_DEBUG_ALIGN_RODATA=y
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_643719=y
@@ -557,6 +544,7 @@ CONFIG_ARM_ERRATA_720789=y
 CONFIG_ARM_ERRATA_754322=y
 CONFIG_ARM_ERRATA_754327=y
 CONFIG_ARM_ERRATA_764369=y
+# CONFIG_ARM_ERRATA_764319 is not set
 CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_ERRATA_798181=y
 CONFIG_ARM_ERRATA_773022=y
@@ -582,6 +570,7 @@ CONFIG_HAVE_SMP=y
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
 CONFIG_CURRENT_POINTER_IN_TPIDRURO=y
+CONFIG_IRQSTACKS=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 # CONFIG_SCHED_MC is not set
 # CONFIG_SCHED_SMT is not set
@@ -599,7 +588,6 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_NR_CPUS=8
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
-CONFIG_ARCH_NR_GPIO=2048
 CONFIG_HZ_FIXED=0
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_200 is not set
@@ -620,9 +608,8 @@ CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARM_MODULE_PLTS=y
-CONFIG_FORCE_MAX_ZONEORDER=12
+CONFIG_ARCH_FORCE_MAX_ORDER=12
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 # CONFIG_PARAVIRT is not set
@@ -706,6 +693,7 @@ CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_DT_IDLE_STATES=y
+CONFIG_DT_IDLE_GENPD=y
 
 #
 # ARM CPU Idle Drivers
@@ -751,6 +739,7 @@ CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_AUTOSLEEP=y
+# CONFIG_PM_USERSPACE_AUTOSLEEP is not set
 CONFIG_PM_WAKELOCKS=y
 CONFIG_PM_WAKELOCKS_LIMIT=100
 CONFIG_PM_WAKELOCKS_GC=y
@@ -772,27 +761,6 @@ CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # end of Power management options
 
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM=y
-CONFIG_CRYPTO_SHA1_ARM_NEON=m
-# CONFIG_CRYPTO_SHA1_ARM_CE is not set
-# CONFIG_CRYPTO_SHA2_ARM_CE is not set
-CONFIG_CRYPTO_SHA256_ARM=m
-CONFIG_CRYPTO_SHA512_ARM=m
-CONFIG_CRYPTO_BLAKE2S_ARM=m
-CONFIG_CRYPTO_BLAKE2B_NEON=m
-CONFIG_CRYPTO_AES_ARM=y
-CONFIG_CRYPTO_AES_ARM_BS=m
-# CONFIG_CRYPTO_AES_ARM_CE is not set
-# CONFIG_CRYPTO_GHASH_ARM_CE is not set
-# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
-# CONFIG_CRYPTO_CRC32_ARM_CE is not set
-CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_CRYPTO_POLY1305_ARM=m
-CONFIG_CRYPTO_NHPOLY1305_NEON=m
-CONFIG_CRYPTO_CURVE25519_NEON=m
-CONFIG_AS_VFP_VMRS_FPINST=y
-
 #
 # General architecture-dependent options
 #
@@ -808,6 +776,7 @@ CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
 CONFIG_HAVE_NMI=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
@@ -836,11 +805,14 @@ CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_LTO_NONE=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
@@ -852,13 +824,14 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
@@ -873,7 +846,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+CONFIG_FUNCTION_ALIGNMENT=0
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -882,6 +855,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_UNLOAD_TAINT_TRACKING is not set
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
@@ -895,6 +869,7 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
+CONFIG_BLOCK_LEGACY_AUTOLOAD=y
 CONFIG_BLK_RQ_ALLOC_TIME=y
 CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
@@ -945,6 +920,7 @@ CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
 CONFIG_BLOCK_HOLDER_DEPRECATED=y
+CONFIG_BLK_MQ_STACKING=y
 
 #
 # IO Schedulers
@@ -979,7 +955,6 @@ CONFIG_BINFMT_FLAT=y
 CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
 # CONFIG_BINFMT_FLAT_OLD is not set
 CONFIG_BINFMT_ZFLAT=y
-CONFIG_BINFMT_SHARED_FLAT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
 # end of Executable file formats
@@ -987,6 +962,43 @@ CONFIG_COREDUMP=y
 #
 # Memory Management options
 #
+CONFIG_ZPOOL=y
+CONFIG_SWAP=y
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=m
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_ZSMALLOC_CHAIN_SIZE=8
+
+#
+# SLAB allocator options
+#
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB_DEPRECATED is not set
+# CONFIG_SLUB_TINY is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+# CONFIG_SLUB_STATS is not set
+CONFIG_SLUB_CPU_PARTIAL=y
+# end of SLAB allocator options
+
+# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
+# CONFIG_COMPAT_BRK is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
@@ -998,44 +1010,32 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 CONFIG_PAGE_REPORTING=y
 CONFIG_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
 CONFIG_BOUNCE=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_FRONTSWAP=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_SYSFS is not set
 CONFIG_CMA_AREAS=7
-CONFIG_ZSWAP=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
-CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
-CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
-# CONFIG_ZSWAP_DEFAULT_ON is not set
-CONFIG_ZPOOL=y
-CONFIG_ZBUD=y
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=m
-# CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_ZONE_DMA=y
+CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_KMAP_LOCAL=y
 CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
 # CONFIG_ANON_VMA_NAME is not set
+CONFIG_USERFAULTFD=y
+# CONFIG_LRU_GEN is not set
 
 #
 # Data Access Monitoring
@@ -1109,6 +1109,7 @@ CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 # CONFIG_INET_ESPINTCP is not set
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TABLE_PERTURB_ORDER=16
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -1204,6 +1205,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CONNTRACK_OVS=y
 CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_GRE=y
 CONFIG_NF_CT_PROTO_SCTP=y
@@ -1231,6 +1233,7 @@ CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NF_NAT_OVS=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y
@@ -1245,7 +1248,6 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
@@ -1266,6 +1268,7 @@ CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NFT_REJECT_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
+# CONFIG_NF_FLOW_TABLE_PROCFS is not set
 CONFIG_NETFILTER_XTABLES=m
 
 #
@@ -1456,7 +1459,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_RAW=m
@@ -1528,6 +1530,7 @@ CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
 CONFIG_BPFILTER=y
+CONFIG_BPFILTER_UMH=m
 CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
@@ -1582,6 +1585,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 # CONFIG_BRIDGE_MRP is not set
 # CONFIG_BRIDGE_CFM is not set
 CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_NONE=m
 # CONFIG_NET_DSA_TAG_AR9331 is not set
 CONFIG_NET_DSA_TAG_BRCM_COMMON=m
 CONFIG_NET_DSA_TAG_BRCM=m
@@ -1599,6 +1603,7 @@ CONFIG_NET_DSA_TAG_EDSA=m
 # CONFIG_NET_DSA_TAG_QCA is not set
 # CONFIG_NET_DSA_TAG_RTL4_A is not set
 # CONFIG_NET_DSA_TAG_RTL8_4 is not set
+# CONFIG_NET_DSA_TAG_RZN1_A5PSW is not set
 # CONFIG_NET_DSA_TAG_LAN9303 is not set
 # CONFIG_NET_DSA_TAG_SJA1105 is not set
 CONFIG_NET_DSA_TAG_TRAILER=m
@@ -1606,7 +1611,6 @@ CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
 CONFIG_ATALK=m
@@ -1642,10 +1646,8 @@ CONFIG_NET_SCHED=y
 #
 # Queueing/Scheduling
 #
-CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_RED=m
@@ -1655,9 +1657,9 @@ CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_CBS=m
 CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_MQPRIO_LIB=m
 CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
@@ -1681,14 +1683,11 @@ CONFIG_NET_SCH_ETS=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
 CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
@@ -1811,57 +1810,6 @@ CONFIG_CAN_BCM=m
 CONFIG_CAN_GW=m
 CONFIG_CAN_J1939=m
 CONFIG_CAN_ISOTP=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_VXCAN=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-CONFIG_CAN_FLEXCAN=m
-CONFIG_CAN_GRCAN=m
-# CONFIG_CAN_KVASER_PCIEFD is not set
-CONFIG_CAN_SUN4I=m
-CONFIG_CAN_TI_HECC=m
-CONFIG_CAN_XILINXCAN=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
-# CONFIG_CAN_C_CAN_PCI is not set
-# CONFIG_CAN_CC770 is not set
-# CONFIG_CAN_IFI_CANFD is not set
-# CONFIG_CAN_M_CAN is not set
-# CONFIG_CAN_PEAK_PCIEFD is not set
-# CONFIG_CAN_SJA1000 is not set
-# CONFIG_CAN_SOFTING is not set
-
-#
-# CAN SPI interfaces
-#
-CONFIG_CAN_HI311X=m
-CONFIG_CAN_MCP251X=m
-CONFIG_CAN_MCP251XFD=m
-# CONFIG_CAN_MCP251XFD_SANITY is not set
-# end of CAN SPI interfaces
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_8DEV_USB=m
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-# CONFIG_CAN_ETAS_ES58X is not set
-CONFIG_CAN_GS_USB=m
-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
@@ -1872,6 +1820,7 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=m
 CONFIG_BT_HS=y
 CONFIG_BT_LE=y
+CONFIG_BT_LE_L2CAP_ECRED=y
 CONFIG_BT_6LOWPAN=m
 CONFIG_BT_LEDS=y
 CONFIG_BT_MSFTEXT=y
@@ -1890,6 +1839,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_MTK=m
 CONFIG_BT_HCIBTUSB=m
 # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
+CONFIG_BT_HCIBTUSB_POLL_SYNC=y
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
@@ -1909,6 +1859,7 @@ CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
+# CONFIG_BT_HCIBCM4377 is not set
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIVHCI=m
@@ -1924,8 +1875,10 @@ CONFIG_BT_HCIRSI=m
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_INJECT_RX_DELAY is not set
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=y
+# CONFIG_RXPERF is not set
 # CONFIG_AF_KCM is not set
 CONFIG_STREAM_PARSER=y
 # CONFIG_MCTP is not set
@@ -2028,6 +1981,7 @@ CONFIG_NET_SELFTESTS=y
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
+CONFIG_PAGE_POOL_STATS=y
 CONFIG_FAILOVER=m
 CONFIG_ETHTOOL_NETLINK=y
 
@@ -2054,12 +2008,10 @@ CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
 CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_STUB=m
 CONFIG_PCI_ECAM=y
-CONFIG_PCI_BRIDGE_EMUL=y
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
@@ -2068,12 +2020,13 @@ CONFIG_PCIE_BUS_DEFAULT=y
 # CONFIG_PCIE_BUS_SAFE is not set
 # CONFIG_PCIE_BUS_PERFORMANCE is not set
 # CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_HOTPLUG_PCI is not set
 
 #
 # PCI controller drivers
 #
-CONFIG_PCI_MVEBU=y
 # CONFIG_PCI_FTPCI100 is not set
 CONFIG_PCI_TEGRA=y
 CONFIG_PCI_HOST_COMMON=y
@@ -2095,7 +2048,7 @@ CONFIG_PCI_DRA7XX_HOST=y
 CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_HOST=y
 # CONFIG_PCI_EXYNOS is not set
-CONFIG_PCI_IMX6=y
+# CONFIG_PCI_IMX6_HOST is not set
 # CONFIG_PCI_LAYERSCAPE is not set
 # CONFIG_PCIE_ARMADA_8K is not set
 # CONFIG_PCIE_ROCKCHIP_DW_HOST is not set
@@ -2147,11 +2100,15 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 CONFIG_FW_LOADER=y
 CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_COMPRESS_XZ=y
+# CONFIG_FW_LOADER_COMPRESS_ZSTD is not set
 CONFIG_FW_CACHE=y
+# CONFIG_FW_UPLOAD is not set
 # end of Firmware loader
 
 CONFIG_WANT_DEV_COREDUMP=y
@@ -2195,6 +2152,7 @@ CONFIG_TI_SYSC=y
 CONFIG_VEXPRESS_CONFIG=y
 # CONFIG_FSL_MC_BUS is not set
 # CONFIG_MHI_BUS is not set
+# CONFIG_MHI_BUS_EP is not set
 # end of Bus devices
 
 CONFIG_CONNECTOR=y
@@ -2208,12 +2166,15 @@ CONFIG_PROC_EVENTS=y
 # ARM System Control and Management Interface Protocol
 #
 CONFIG_ARM_SCMI_PROTOCOL=y
+# CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set
 CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
 CONFIG_ARM_SCMI_HAVE_SHMEM=y
 CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
 CONFIG_ARM_SCMI_TRANSPORT_SMC=y
+# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
 CONFIG_ARM_SCMI_POWER_DOMAIN=y
+# CONFIG_ARM_SCMI_POWER_CONTROL is not set
 # end of ARM System Control and Management Interface Protocol
 
 # CONFIG_ARM_SCPI_PROTOCOL is not set
@@ -2221,7 +2182,6 @@ CONFIG_ARM_SCMI_POWER_DOMAIN=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_QCOM_SCM=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-CONFIG_SYSFB=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 CONFIG_TRUSTED_FOUNDATIONS=y
 # CONFIG_TURRIS_MOX_RWTM is not set
@@ -2235,12 +2195,13 @@ CONFIG_EFI_PARAMS_FROM_FDT=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_GENERIC_STUB=y
 CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_BOOTLOADER_CONTROL=m
 CONFIG_EFI_CAPSULE_LOADER=m
 # CONFIG_EFI_TEST is not set
 CONFIG_RESET_ATTACK_MITIGATION=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
+# CONFIG_EFI_COCO_SECRET is not set
 # end of EFI (Extensible Firmware Interface) Support
 
 CONFIG_ARM_PSCI_FW=y
@@ -2416,6 +2377,7 @@ CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_ECC_SW_HAMMING=y
 # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
 CONFIG_MTD_NAND_ECC_SW_BCH=y
+# CONFIG_MTD_NAND_ECC_MXIC is not set
 # end of ECC engine support
 # end of NAND
 
@@ -2466,12 +2428,12 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
+# CONFIG_ZRAM_MULTI_COMP is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -2479,6 +2441,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_ATA_OVER_ETH=m
 CONFIG_VIRTIO_BLK=y
 CONFIG_BLK_DEV_RBD=m
+# CONFIG_BLK_DEV_UBLK is not set
 
 #
 # NVME Support
@@ -2486,9 +2449,11 @@ CONFIG_BLK_DEV_RBD=m
 CONFIG_NVME_CORE=m
 CONFIG_BLK_DEV_NVME=m
 # CONFIG_NVME_MULTIPATH is not set
+# CONFIG_NVME_VERBOSE_ERRORS is not set
 # CONFIG_NVME_HWMON is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TCP is not set
+# CONFIG_NVME_AUTH is not set
 # CONFIG_NVME_TARGET is not set
 # end of NVME Support
 
@@ -2522,6 +2487,8 @@ CONFIG_SRAM_EXEC=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_HISI_HIKEY_USB is not set
+# CONFIG_OPEN_DICE is not set
+# CONFIG_VCPU_STALL_DETECTOR is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -2550,15 +2517,14 @@ CONFIG_TI_ST=m
 CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
-# CONFIG_BEAGLEBONE_PINMUX_HELPER is not set
 # CONFIG_ECHO is not set
 # CONFIG_BCM_VK is not set
 # CONFIG_MISC_ALCOR_PCI is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISC_RTSX_USB is not set
-# CONFIG_HABANA_AI is not set
 # CONFIG_UACCE is not set
 # CONFIG_PVPANIC is not set
+# CONFIG_GP_PCI1XXXX is not set
 # end of Misc devices
 
 #
@@ -2631,14 +2597,8 @@ CONFIG_SCSI_MPT3SAS_MAX_SGE=128
 CONFIG_SCSI_MPT2SAS=m
 # CONFIG_SCSI_MPI3MR is not set
 # CONFIG_SCSI_SMARTPQI is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
-# CONFIG_SCSI_UFS_BSG is not set
-# CONFIG_SCSI_UFS_HPB is not set
-# CONFIG_SCSI_UFS_HWMON is not set
 # CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_MYRB is not set
 # CONFIG_SCSI_MYRS is not set
 CONFIG_LIBFC=m
@@ -2677,7 +2637,6 @@ CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
 # end of SCSI device support
 
-CONFIG_HAVE_PATA_PLATFORM=y
 CONFIG_ATA=y
 CONFIG_SATA_HOST=y
 CONFIG_PATA_TIMINGS=y
@@ -2692,6 +2651,7 @@ CONFIG_SATA_AHCI=y
 CONFIG_SATA_MOBILE_LPM_POLICY=0
 CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_AHCI_DM816 is not set
+# CONFIG_AHCI_DWC is not set
 CONFIG_AHCI_IMX=y
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_MVEBU=y
@@ -2927,17 +2887,17 @@ CONFIG_NET_DSA_BCM_SF2=m
 # CONFIG_NET_DSA_LANTIQ_GSWIP is not set
 # CONFIG_NET_DSA_MT7530 is not set
 CONFIG_NET_DSA_MV88E6060=m
-# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
-# CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set
+# CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON is not set
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
+# CONFIG_NET_DSA_MSCC_OCELOT_EXT is not set
 # CONFIG_NET_DSA_MSCC_FELIX is not set
 # CONFIG_NET_DSA_MSCC_SEVILLE is not set
 # CONFIG_NET_DSA_AR9331 is not set
+# CONFIG_NET_DSA_QCA8K is not set
 # CONFIG_NET_DSA_SJA1105 is not set
 # CONFIG_NET_DSA_XRS700X_I2C is not set
 # CONFIG_NET_DSA_XRS700X_MDIO is not set
-# CONFIG_NET_DSA_QCA8K is not set
 # CONFIG_NET_DSA_REALTEK is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
@@ -3013,7 +2973,9 @@ CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_GEMINI_ETHERNET is not set
+CONFIG_NET_VENDOR_DAVICOM=y
 # CONFIG_DM9000 is not set
+# CONFIG_DM9051 is not set
 # CONFIG_DNET is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_TULIP=y
@@ -3055,7 +3017,10 @@ CONFIG_GIANFAR=m
 # CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_ENETC_IERB is not set
 # CONFIG_FSL_ENETC_MDIO is not set
+CONFIG_NET_VENDOR_FUNGIBLE=y
+# CONFIG_FUN_ETH is not set
 CONFIG_NET_VENDOR_GOOGLE=y
+# CONFIG_GVE is not set
 CONFIG_NET_VENDOR_HISILICON=y
 # CONFIG_HIX5HD2_GMAC is not set
 # CONFIG_HISI_FEMAC is not set
@@ -3086,7 +3051,12 @@ CONFIG_I40EVF=m
 # CONFIG_ICE is not set
 # CONFIG_FM10K is not set
 # CONFIG_IGC is not set
+CONFIG_NET_VENDOR_WANGXUN=y
+# CONFIG_NGBE is not set
+# CONFIG_TXGBE is not set
 CONFIG_JME=m
+CONFIG_NET_VENDOR_ADI=y
+# CONFIG_ADIN1110 is not set
 CONFIG_NET_VENDOR_LITEX=y
 # CONFIG_LITEX_LITEETH is not set
 CONFIG_NET_VENDOR_MARVELL=y
@@ -3117,11 +3087,10 @@ CONFIG_MLX5_EN_RXNFC=y
 CONFIG_MLX5_MPFS=y
 CONFIG_MLX5_ESWITCH=y
 CONFIG_MLX5_BRIDGE=y
-CONFIG_MLX5_CLS_ACT=y
-CONFIG_MLX5_TC_SAMPLE=y
 CONFIG_MLX5_CORE_EN_DCB=y
 # CONFIG_MLX5_CORE_IPOIB is not set
-# CONFIG_MLX5_IPSEC is not set
+# CONFIG_MLX5_EN_MACSEC is not set
+# CONFIG_MLX5_EN_IPSEC is not set
 CONFIG_MLX5_SW_STEERING=y
 # CONFIG_MLX5_SF is not set
 # CONFIG_MLXSW_CORE is not set
@@ -3137,12 +3106,13 @@ CONFIG_ENC28J60=m
 CONFIG_ENCX24J600=m
 # CONFIG_LAN743X is not set
 # CONFIG_LAN966X_SWITCH is not set
+# CONFIG_VCAP is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
 # CONFIG_MSCC_OCELOT_SWITCH is not set
 CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
-CONFIG_FEALNX=m
+# CONFIG_FEALNX is not set
 CONFIG_NET_VENDOR_NI=y
 # CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_NATSEMI=y
@@ -3150,8 +3120,6 @@ CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_NETERION=y
 CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_NET_VENDOR_NETRONOME=y
 # CONFIG_NFP is not set
 CONFIG_NET_VENDOR_8390=y
@@ -3207,10 +3175,10 @@ CONFIG_SFC_MTD=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MCDI_LOGGING=y
 # CONFIG_SFC_FALCON is not set
+# CONFIG_SFC_SIENA is not set
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_EPIC100=m
-CONFIG_SMC911X=m
 CONFIG_SMSC911X=m
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_SOCIONEXT=y
@@ -3227,6 +3195,7 @@ CONFIG_DWMAC_SUNXI=m
 CONFIG_DWMAC_SUN8I=m
 CONFIG_DWMAC_IMX8=m
 # CONFIG_DWMAC_INTEL_PLAT is not set
+# CONFIG_DWMAC_TEGRA is not set
 # CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_STMMAC_PCI is not set
 CONFIG_NET_VENDOR_SUN=y
@@ -3279,6 +3248,7 @@ CONFIG_SFP=m
 CONFIG_AMD_PHY=m
 # CONFIG_MESON_GXL_PHY is not set
 # CONFIG_ADIN_PHY is not set
+# CONFIG_ADIN1100_PHY is not set
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AX88796B_PHY=m
 CONFIG_BROADCOM_PHY=m
@@ -3307,6 +3277,7 @@ CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
+# CONFIG_NCN26000_PHY is not set
 CONFIG_AT803X_PHY=y
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
@@ -3320,17 +3291,70 @@ CONFIG_TERANETICS_PHY=m
 CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=y
 # CONFIG_DP83869_PHY is not set
+# CONFIG_DP83TD510_PHY is not set
 CONFIG_VITESSE_PHY=y
 # CONFIG_XILINX_GMII2RGMII is not set
 # CONFIG_MICREL_KS8995MA is not set
+# CONFIG_PSE_CONTROLLER is not set
+CONFIG_CAN_DEV=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
+CONFIG_CAN_NETLINK=y
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_RX_OFFLOAD=y
+# CONFIG_CAN_CAN327 is not set
+CONFIG_CAN_FLEXCAN=m
+CONFIG_CAN_GRCAN=m
+# CONFIG_CAN_KVASER_PCIEFD is not set
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_SUN4I=m
+CONFIG_CAN_TI_HECC=m
+CONFIG_CAN_XILINXCAN=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+# CONFIG_CAN_C_CAN_PCI is not set
+# CONFIG_CAN_CC770 is not set
+# CONFIG_CAN_CTUCANFD_PCI is not set
+# CONFIG_CAN_CTUCANFD_PLATFORM is not set
+# CONFIG_CAN_IFI_CANFD is not set
+# CONFIG_CAN_M_CAN is not set
+# CONFIG_CAN_PEAK_PCIEFD is not set
+# CONFIG_CAN_SJA1000 is not set
+# CONFIG_CAN_SOFTING is not set
+
+#
+# CAN SPI interfaces
+#
+CONFIG_CAN_HI311X=m
+CONFIG_CAN_MCP251X=m
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+# CONFIG_CAN_ESD_USB is not set
+# CONFIG_CAN_ETAS_ES58X is not set
+CONFIG_CAN_GS_USB=m
+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
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_BUS=y
 CONFIG_FWNODE_MDIO=y
 CONFIG_OF_MDIO=y
 CONFIG_MDIO_DEVRES=y
 CONFIG_MDIO_SUN4I=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=y
 CONFIG_MDIO_BCM_UNIMAC=m
+# CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_MVUSB is not set
@@ -3343,6 +3367,7 @@ CONFIG_MDIO_I2C=m
 #
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MESON_G12A=m
+CONFIG_MDIO_BUS_MUX_MESON_GXL=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
@@ -3467,6 +3492,7 @@ CONFIG_ATH11K=m
 CONFIG_ATH11K_AHB=m
 # CONFIG_ATH11K_PCI is not set
 # CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH12K is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
@@ -3599,11 +3625,15 @@ CONFIG_MT7915E=m
 CONFIG_MT7921_COMMON=m
 CONFIG_MT7921E=m
 CONFIG_MT7921S=m
+CONFIG_MT7921U=m
+# CONFIG_MT7996E is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 CONFIG_WILC1000=m
 CONFIG_WILC1000_SDIO=m
 CONFIG_WILC1000_SPI=m
 # CONFIG_WILC1000_HW_OOB_INTR is not set
+CONFIG_WLAN_VENDOR_PURELIFI=y
+# CONFIG_PLFXLC is not set
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -3658,17 +3688,25 @@ CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
 CONFIG_RTW88=m
 # CONFIG_RTW88_8822BE is not set
+# CONFIG_RTW88_8822BU is not set
 # CONFIG_RTW88_8822CE is not set
+# CONFIG_RTW88_8822CU is not set
 # CONFIG_RTW88_8723DE is not set
+# CONFIG_RTW88_8723DU is not set
 # CONFIG_RTW88_8821CE is not set
+# CONFIG_RTW88_8821CU is not set
 CONFIG_RTW89=m
 # CONFIG_RTW89_8852AE is not set
+# CONFIG_RTW89_8852BE is not set
+# CONFIG_RTW89_8852CE is not set
 CONFIG_WLAN_VENDOR_RSI=y
 CONFIG_RSI_91X=m
 # CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
 CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_SILABS=y
+CONFIG_WFX=m
 CONFIG_WLAN_VENDOR_ST=y
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
@@ -3682,7 +3720,6 @@ CONFIG_WL18XX=m
 CONFIG_WLCORE=m
 CONFIG_WLCORE_SPI=m
 CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
@@ -3696,17 +3733,14 @@ CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_IEEE802154_DRIVERS=m
 # CONFIG_IEEE802154_FAKELB is not set
 CONFIG_IEEE802154_AT86RF230=m
-# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
 CONFIG_IEEE802154_MRF24J40=m
 CONFIG_IEEE802154_CC2520=m
 CONFIG_IEEE802154_ATUSB=m
-CONFIG_IEEE802154_WPANUSB=m
 CONFIG_IEEE802154_ADF7242=m
 CONFIG_IEEE802154_CA8210=m
 # CONFIG_IEEE802154_CA8210_DEBUGFS is not set
 CONFIG_IEEE802154_MCR20A=m
 # CONFIG_IEEE802154_HWSIM is not set
-CONFIG_IEEE802154_BCFSERIAL=m
 
 #
 # Wireless WAN
@@ -3727,6 +3761,7 @@ CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=y
 CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_MATRIXKMAP=y
+CONFIG_INPUT_VIVALDIFMAP=y
 
 #
 # Userland interfaces
@@ -3767,6 +3802,7 @@ CONFIG_KEYBOARD_IMX=m
 # CONFIG_KEYBOARD_NEWTON is not set
 CONFIG_KEYBOARD_TEGRA=m
 # CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_PINEPHONE is not set
 CONFIG_KEYBOARD_SAMSUNG=y
 CONFIG_KEYBOARD_STOWAWAY=m
 # CONFIG_KEYBOARD_SUNKBD is not set
@@ -3839,6 +3875,7 @@ CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
 CONFIG_JOYSTICK_PXRC=m
 CONFIG_JOYSTICK_QWIIC=m
 CONFIG_JOYSTICK_FSIA6B=m
+# CONFIG_JOYSTICK_SENSEHAT is not set
 CONFIG_INPUT_TABLET=y
 CONFIG_TABLET_USB_ACECAD=m
 CONFIG_TABLET_USB_AIPTEK=m
@@ -3868,6 +3905,7 @@ CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
 CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
 CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+# CONFIG_TOUCHSCREEN_CYTTSP5 is not set
 CONFIG_TOUCHSCREEN_DA9052=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
@@ -3879,6 +3917,7 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_HIDEEP=m
 # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set
+# CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set
 CONFIG_TOUCHSCREEN_ILI210X=m
 # CONFIG_TOUCHSCREEN_ILITEK is not set
 CONFIG_TOUCHSCREEN_S6SY761=m
@@ -3894,6 +3933,7 @@ CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
 # CONFIG_TOUCHSCREEN_MSG2638 is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
+# CONFIG_TOUCHSCREEN_IMAGIS is not set
 CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
@@ -3954,6 +3994,7 @@ CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 # CONFIG_TOUCHSCREEN_IQS5XX is not set
 # CONFIG_TOUCHSCREEN_ZINITIX is not set
+# CONFIG_TOUCHSCREEN_HIMAX_HX83112B is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
@@ -3994,9 +4035,11 @@ CONFIG_INPUT_DA9063_ONKEY=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
 CONFIG_INPUT_ADXL34X_SPI=m
+# CONFIG_INPUT_IBM_PANEL is not set
 CONFIG_INPUT_IMS_PCU=m
 # CONFIG_INPUT_IQS269A is not set
 # CONFIG_INPUT_IQS626A is not set
+# CONFIG_INPUT_IQS7222 is not set
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_DRV260X_HAPTICS=m
@@ -4050,6 +4093,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
+CONFIG_LEGACY_TIOCSTI=y
 CONFIG_LDISC_AUTOLOAD=y
 
 #
@@ -4062,13 +4106,14 @@ CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
 # CONFIG_SERIAL_8250_FINTEK is not set
 CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_SERIAL_8250_DMA is not set
+CONFIG_SERIAL_8250_PCILIB=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_EXAR=y
 CONFIG_SERIAL_8250_NR_UARTS=6
 CONFIG_SERIAL_8250_RUNTIME_UARTS=6
 CONFIG_SERIAL_8250_EXTENDED=y
 # CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
+# CONFIG_SERIAL_8250_PCI1XXXX is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 # CONFIG_SERIAL_8250_RSA is not set
@@ -4090,7 +4135,7 @@ CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
+# CONFIG_SERIAL_EARLYCON_SEMIHOST is not set
 # CONFIG_SERIAL_KGDB_NMI is not set
 CONFIG_SERIAL_MESON=y
 CONFIG_SERIAL_MESON_CONSOLE=y
@@ -4112,7 +4157,6 @@ CONFIG_CONSOLE_POLL=y
 # CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 CONFIG_SERIAL_XILINX_PS_UART=y
@@ -4143,6 +4187,7 @@ CONFIG_TTY_PRINTK=m
 CONFIG_TTY_PRINTK_LEVEL=6
 CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_IPMI_HANDLER is not set
+# CONFIG_SSIF_IPMI_BMC is not set
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -4165,6 +4210,7 @@ CONFIG_TCG_TPM=m
 CONFIG_HW_RANDOM_TPM=y
 # CONFIG_TCG_TIS is not set
 # CONFIG_TCG_TIS_SPI is not set
+# CONFIG_TCG_TIS_I2C is not set
 # CONFIG_TCG_TIS_I2C_CR50 is not set
 CONFIG_TCG_TIS_I2C_ATMEL=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
@@ -4174,7 +4220,6 @@ CONFIG_TCG_TIS_I2C_INFINEON=m
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
 # end of Character devices
 
 #
@@ -4268,6 +4313,7 @@ CONFIG_I2C_XILINX=y
 CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_DLN2=m
 # CONFIG_I2C_CP2615 is not set
+# CONFIG_I2C_PCI1XXXX is not set
 CONFIG_I2C_ROBOTFUZZ_OSIF=m
 CONFIG_I2C_TAOS_EVM=m
 CONFIG_I2C_TINY_USB=m
@@ -4318,10 +4364,13 @@ CONFIG_SPI_IMX=y
 CONFIG_SPI_FSL_DSPI=y
 CONFIG_SPI_MESON_SPICC=m
 CONFIG_SPI_MESON_SPIFC=m
+# CONFIG_SPI_MICROCHIP_CORE is not set
+# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_OMAP24XX=m
 CONFIG_SPI_TI_QSPI=m
 CONFIG_SPI_ORION=y
+# CONFIG_SPI_PCI1XXXX is not set
 CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX is not set
 CONFIG_SPI_ROCKCHIP=y
@@ -4329,6 +4378,7 @@ CONFIG_SPI_ROCKCHIP=y
 CONFIG_SPI_S3C64XX=y
 CONFIG_SPI_SC18IS602=m
 # CONFIG_SPI_SIFIVE is not set
+# CONFIG_SPI_SN_F_OSPI is not set
 CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
 # CONFIG_SPI_MXIC is not set
@@ -4396,6 +4446,7 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AS3722=y
 CONFIG_PINCTRL_AXP209=y
+# CONFIG_PINCTRL_CY8C95X0 is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 # CONFIG_PINCTRL_OCELOT is not set
@@ -4418,13 +4469,11 @@ CONFIG_PINCTRL_IMX6SX=y
 CONFIG_PINCTRL_IMX6UL=y
 CONFIG_PINCTRL_IMX7D=y
 CONFIG_PINCTRL_IMX7ULP=y
-# CONFIG_PINCTRL_IMX8MM is not set
-# CONFIG_PINCTRL_IMX8MN is not set
-# CONFIG_PINCTRL_IMX8MP is not set
-# CONFIG_PINCTRL_IMX8MQ is not set
 # CONFIG_PINCTRL_IMX8ULP is not set
 # CONFIG_PINCTRL_IMXRT1050 is not set
+# CONFIG_PINCTRL_IMX93 is not set
 CONFIG_PINCTRL_VF610=y
+# CONFIG_PINCTRL_IMXRT1170 is not set
 CONFIG_PINCTRL_MESON=y
 CONFIG_PINCTRL_MESON8=y
 CONFIG_PINCTRL_MESON8B=y
@@ -4457,6 +4506,7 @@ CONFIG_PINCTRL_SUN8I_H3_R=y
 CONFIG_PINCTRL_SUN8I_V3S=y
 CONFIG_PINCTRL_SUN9I_A80=y
 CONFIG_PINCTRL_SUN9I_A80_R=y
+CONFIG_PINCTRL_SUN20I_D1=y
 # CONFIG_PINCTRL_SUN50I_A64 is not set
 # CONFIG_PINCTRL_SUN50I_A64_R is not set
 # CONFIG_PINCTRL_SUN50I_A100 is not set
@@ -4482,7 +4532,6 @@ CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
-# CONFIG_GPIO_OF_HELPER is not set
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MAX730X=m
 
@@ -4507,7 +4556,6 @@ CONFIG_GPIO_MXC=y
 CONFIG_GPIO_OMAP=y
 CONFIG_GPIO_PL061=y
 CONFIG_GPIO_ROCKCHIP=y
-# CONFIG_GPIO_SAMA5D2_PIOBU is not set
 # CONFIG_GPIO_SIFIVE is not set
 CONFIG_GPIO_SYSCON=y
 CONFIG_GPIO_TEGRA=y
@@ -4522,7 +4570,6 @@ CONFIG_GPIO_ZYNQ=y
 #
 # I2C GPIO expanders
 #
-CONFIG_GPIO_ADP5588=m
 CONFIG_GPIO_ADNP=m
 # CONFIG_GPIO_GW_PLD is not set
 CONFIG_GPIO_MAX7300=m
@@ -4581,6 +4628,7 @@ CONFIG_GPIO_XRA1403=m
 # Virtual GPIO drivers
 #
 CONFIG_GPIO_AGGREGATOR=m
+# CONFIG_GPIO_LATCH is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_VIRTIO is not set
 # CONFIG_GPIO_SIM is not set
@@ -4596,7 +4644,6 @@ CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_MXC=m
-# CONFIG_W1_MASTER_DS1WM is not set
 CONFIG_W1_MASTER_GPIO=m
 CONFIG_HDQ_MASTER_OMAP=m
 # CONFIG_W1_MASTER_SGI is not set
@@ -4633,6 +4680,7 @@ CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 # CONFIG_POWER_RESET_LINKSTATION is not set
+# CONFIG_POWER_RESET_ODROID_GO_ULTRA_POWEROFF is not set
 # CONFIG_POWER_RESET_LTC2952 is not set
 # CONFIG_POWER_RESET_QNAP is not set
 # CONFIG_POWER_RESET_REGULATOR is not set
@@ -4648,8 +4696,8 @@ CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
-# CONFIG_PDA_POWER is not set
 CONFIG_GENERIC_ADC_BATTERY=m
+# CONFIG_IP5XXX_POWER is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_CHARGER_ADP5061 is not set
 CONFIG_BATTERY_ACT8945A=m
@@ -4658,6 +4706,7 @@ CONFIG_BATTERY_DS2760=m
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SAMSUNG_SDI is not set
 CONFIG_BATTERY_SBS=m
 CONFIG_CHARGER_SBS=m
 CONFIG_MANAGER_SBS=m
@@ -4696,6 +4745,7 @@ CONFIG_CHARGER_BQ24735=m
 # CONFIG_CHARGER_BQ25890 is not set
 # CONFIG_CHARGER_BQ25980 is not set
 # CONFIG_CHARGER_BQ256XX is not set
+# CONFIG_CHARGER_RK817 is not set
 # CONFIG_CHARGER_SMB347 is not set
 CONFIG_CHARGER_TPS65090=m
 # CONFIG_CHARGER_TPS65217 is not set
@@ -4703,12 +4753,15 @@ CONFIG_CHARGER_TPS65090=m
 # CONFIG_BATTERY_GOLDFISH is not set
 # CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
+# CONFIG_CHARGER_RT9467 is not set
+# CONFIG_CHARGER_RT9471 is not set
 # CONFIG_CHARGER_CROS_USBPD is not set
 CONFIG_CHARGER_CROS_PCHG=y
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_RN5T618_POWER is not set
 CONFIG_BATTERY_ACER_A500=m
+# CONFIG_BATTERY_UG3105 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4719,7 +4772,6 @@ CONFIG_HWMON_VID=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
@@ -4739,7 +4791,6 @@ CONFIG_SENSORS_AS370=m
 CONFIG_SENSORS_ASC7621=m
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
 CONFIG_SENSORS_ARM_SCMI=y
-# CONFIG_SENSORS_ASPEED is not set
 CONFIG_SENSORS_ATXP1=m
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
 # CONFIG_SENSORS_CORSAIR_PSU is not set
@@ -4784,13 +4835,14 @@ CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX197=m
 CONFIG_SENSORS_MAX31722=m
 CONFIG_SENSORS_MAX31730=m
+# CONFIG_SENSORS_MAX31760 is not set
 CONFIG_SENSORS_MAX6620=m
 CONFIG_SENSORS_MAX6621=m
 CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MAX31790=m
+# CONFIG_SENSORS_MC34VR500 is not set
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_TC654=m
 # CONFIG_SENSORS_TPS23861 is not set
@@ -4816,7 +4868,7 @@ CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
+# CONFIG_SENSORS_NCT6775_I2C is not set
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
@@ -4842,6 +4894,8 @@ CONFIG_SENSORS_IR38064=m
 CONFIG_SENSORS_IRPS5401=m
 CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
+# CONFIG_SENSORS_LM25066_REGULATOR is not set
+# CONFIG_SENSORS_LT7182S is not set
 CONFIG_SENSORS_LTC2978=m
 CONFIG_SENSORS_LTC2978_REGULATOR=y
 CONFIG_SENSORS_LTC3815=m
@@ -4856,16 +4910,22 @@ CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MP2888=m
 CONFIG_SENSORS_MP2975=m
 # CONFIG_SENSORS_MP5023 is not set
+# CONFIG_SENSORS_MPQ7932 is not set
 CONFIG_SENSORS_PIM4328=m
+# CONFIG_SENSORS_PLI1209BC is not set
 CONFIG_SENSORS_PM6764TR=m
 CONFIG_SENSORS_PXE1610=m
 CONFIG_SENSORS_Q54SJ108A2=m
 CONFIG_SENSORS_STPDDC60=m
+# CONFIG_SENSORS_TDA38640 is not set
 CONFIG_SENSORS_TPS40422=m
 # CONFIG_SENSORS_TPS53679 is not set
+# CONFIG_SENSORS_TPS546D24 is not set
 CONFIG_SENSORS_UCD9000=m
 CONFIG_SENSORS_UCD9200=m
+# CONFIG_SENSORS_XDPE152 is not set
 CONFIG_SENSORS_XDPE122=m
+# CONFIG_SENSORS_XDPE122_REGULATOR is not set
 CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_RASPBERRYPI_HWMON=m
@@ -4880,6 +4940,7 @@ CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_EMC1403=m
 CONFIG_SENSORS_EMC2103=m
+# CONFIG_SENSORS_EMC2305 is not set
 CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
@@ -4904,6 +4965,7 @@ CONFIG_SENSORS_TMP103=m
 CONFIG_SENSORS_TMP108=m
 CONFIG_SENSORS_TMP401=m
 CONFIG_SENSORS_TMP421=m
+# CONFIG_SENSORS_TMP464 is not set
 # CONFIG_SENSORS_TMP513 is not set
 CONFIG_SENSORS_VEXPRESS=y
 # CONFIG_SENSORS_VIA686A is not set
@@ -5076,6 +5138,7 @@ CONFIG_MFD_CORE=y
 CONFIG_MFD_ACT8945A=y
 CONFIG_MFD_SUN4I_GPADC=m
 # CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_SMPRO is not set
 CONFIG_MFD_AS3722=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
@@ -5089,7 +5152,6 @@ CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_AXP20X_RSB=y
 CONFIG_MFD_CROS_EC_DEV=y
 # CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_ASIC3 is not set
 # CONFIG_PMIC_DA903X is not set
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_SPI=y
@@ -5106,8 +5168,6 @@ CONFIG_MFD_MC13XXX_SPI=y
 CONFIG_MFD_MC13XXX_I2C=y
 # CONFIG_MFD_MP2629 is not set
 # CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HTC_I2CPLD is not set
 # CONFIG_LPC_ICH is not set
 CONFIG_LPC_SCH=m
 # CONFIG_MFD_IQS62X is not set
@@ -5121,25 +5181,29 @@ CONFIG_MFD_MAX14577=y
 # CONFIG_MFD_MAX77650 is not set
 CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MAX77693=y
+# CONFIG_MFD_MAX77714 is not set
 # CONFIG_MFD_MAX77843 is not set
 CONFIG_MFD_MAX8907=y
 # CONFIG_MFD_MAX8925 is not set
 CONFIG_MFD_MAX8997=y
 CONFIG_MFD_MAX8998=y
 # CONFIG_MFD_MT6360 is not set
+# CONFIG_MFD_MT6370 is not set
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_MENF21BMC is not set
+# CONFIG_MFD_OCELOT is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_MFD_CPCAP is not set
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_NTXEC is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
-# CONFIG_UCB1400_CORE is not set
 # CONFIG_MFD_PM8XXX is not set
+# CONFIG_MFD_SY7636A is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RT4831 is not set
 # CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RT5120 is not set
 # CONFIG_MFD_RC5T583 is not set
 CONFIG_MFD_RK808=y
 CONFIG_MFD_RN5T618=y
@@ -5173,6 +5237,7 @@ CONFIG_MFD_TPS65217=y
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TI_LP87565 is not set
 CONFIG_MFD_TPS65218=y
+# CONFIG_MFD_TPS65219 is not set
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
 # CONFIG_MFD_TPS65912_I2C is not set
@@ -5184,9 +5249,6 @@ CONFIG_TWL6040_CORE=y
 CONFIG_MFD_WL1273_CORE=m
 # CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_TQMX86 is not set
 # CONFIG_MFD_VX855 is not set
 # CONFIG_MFD_LOCHNAGAR is not set
@@ -5208,7 +5270,7 @@ CONFIG_MFD_ACER_A500_EC=m
 # CONFIG_MFD_QCOM_PM8008 is not set
 CONFIG_MFD_VEXPRESS_SYSREG=y
 # CONFIG_RAVE_SP_CORE is not set
-# CONFIG_MFD_INTEL_M10_BMC is not set
+# CONFIG_MFD_INTEL_M10_BMC_SPI is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # CONFIG_MFD_RSMU_SPI is not set
 # end of Multifunction device drivers
@@ -5256,6 +5318,7 @@ CONFIG_REGULATOR_MAX8973=y
 CONFIG_REGULATOR_MAX8997=y
 CONFIG_REGULATOR_MAX8998=y
 # CONFIG_REGULATOR_MAX20086 is not set
+# CONFIG_REGULATOR_MAX20411 is not set
 CONFIG_REGULATOR_MAX77686=y
 CONFIG_REGULATOR_MAX77693=y
 CONFIG_REGULATOR_MAX77802=y
@@ -5282,7 +5345,10 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_RN5T618=y
 # CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RT5190A is not set
+# CONFIG_REGULATOR_RT5759 is not set
 # CONFIG_REGULATOR_RT6160 is not set
+# CONFIG_REGULATOR_RT6190 is not set
 # CONFIG_REGULATOR_RT6245 is not set
 # CONFIG_REGULATOR_RTQ2134 is not set
 # CONFIG_REGULATOR_RTMV20 is not set
@@ -5298,6 +5364,7 @@ CONFIG_REGULATOR_SY8106A=y
 # CONFIG_REGULATOR_SY8827N is not set
 CONFIG_REGULATOR_TPS51632=y
 CONFIG_REGULATOR_TPS62360=y
+# CONFIG_REGULATOR_TPS6286X is not set
 CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR_TPS6507X=y
 # CONFIG_REGULATOR_TPS65086 is not set
@@ -5313,44 +5380,44 @@ CONFIG_REGULATOR_VCTRL=y
 CONFIG_REGULATOR_VEXPRESS=y
 CONFIG_REGULATOR_WM8994=y
 CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
 CONFIG_LIRC=y
+CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_XMP_DECODER=m
-CONFIG_IR_IMON_DECODER=m
-CONFIG_IR_RCMM_DECODER=m
 CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_GPIO_TX=m
 CONFIG_IR_HIX5HD2=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
 CONFIG_IR_IMON=m
 CONFIG_IR_IMON_RAW=m
 CONFIG_IR_MCEUSB=m
 CONFIG_IR_MESON=m
-# CONFIG_IR_MESON_TX is not set
+CONFIG_IR_MESON_TX=m
+CONFIG_IR_PWM_TX=m
 CONFIG_IR_REDRAT3=m
+CONFIG_IR_RX51=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SPI=m
 CONFIG_IR_STREAMZAP=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
+CONFIG_IR_SUNXI=m
+CONFIG_IR_TOY=m
 CONFIG_IR_TTUSBIR=m
-CONFIG_IR_RX51=m
+CONFIG_RC_ATI_REMOTE=m
 CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_IR_GPIO_TX=m
-CONFIG_IR_PWM_TX=m
-CONFIG_IR_SUNXI=m
-CONFIG_IR_SERIAL=m
-CONFIG_IR_SERIAL_TRANSMITTER=y
-# CONFIG_RC_XBOX_DVD is not set
-# CONFIG_IR_TOY is not set
+CONFIG_RC_XBOX_DVD=m
 CONFIG_CEC_CORE=y
 CONFIG_CEC_NOTIFIER=y
 CONFIG_CEC_PIN=y
@@ -5398,7 +5465,6 @@ CONFIG_DVB_CORE=y
 #
 # Video4Linux options
 #
-CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_V4L2_I2C=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -5437,17 +5503,16 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 #
 # Media drivers
 #
+
+#
+# Media drivers
+#
 CONFIG_MEDIA_USB_SUPPORT=y
 
 #
 # Webcam devices
 #
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
 CONFIG_USB_GSPCA_BENQ=m
 CONFIG_USB_GSPCA_CONEX=m
 CONFIG_USB_GSPCA_CPIA1=m
@@ -5472,13 +5537,13 @@ CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SONIXB=m
 CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA1528=m
 CONFIG_USB_GSPCA_SPCA500=m
 CONFIG_USB_GSPCA_SPCA501=m
 CONFIG_USB_GSPCA_SPCA505=m
 CONFIG_USB_GSPCA_SPCA506=m
 CONFIG_USB_GSPCA_SPCA508=m
 CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
 CONFIG_USB_GSPCA_SQ905=m
 CONFIG_USB_GSPCA_SQ905C=m
 CONFIG_USB_GSPCA_SQ930X=m
@@ -5494,29 +5559,31 @@ CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_XIRLINK_CIT=m
 CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_VIDEO_USBTV=m
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 
 #
 # Analog TV USB devices
 #
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_LOADER=m
-CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
 
 #
 # Analog/digital TV USB devices
@@ -5528,41 +5595,13 @@ CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
 
 #
 # Digital TV USB devices
 #
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_DIB3000MC=m
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-# CONFIG_DVB_USB_CXUSB_ANALOG is not set
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_AS102=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
 CONFIG_DVB_USB_V2=m
 CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_AF9035=m
@@ -5570,19 +5609,44 @@ CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_AZ6007=m
 CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_DVBSKY=m
 CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_GL861=m
 CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
 CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_SMS_USB_DRV=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-CONFIG_DVB_AS102=m
 
 #
 # Webcam, TV (analog/digital) USB devices
@@ -5608,21 +5672,24 @@ CONFIG_VIDEO_SOLO6X10=m
 # CONFIG_VIDEO_TW5864 is not set
 CONFIG_VIDEO_TW68=m
 # CONFIG_VIDEO_TW686X is not set
+# CONFIG_VIDEO_ZORAN is not set
 
 #
 # Media capture/analog TV support
 #
+CONFIG_VIDEO_DT3155=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_IVTV_ALSA=m
 CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DT3155=m
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_MXB is not set
 
 #
 # Media capture/analog/hybrid TV support
 #
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
 CONFIG_VIDEO_CX18=m
 CONFIG_VIDEO_CX18_ALSA=m
 CONFIG_VIDEO_CX23885=m
@@ -5636,8 +5703,6 @@ CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_ENABLE_VP3054=y
 CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
 CONFIG_VIDEO_SAA7134=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_RC=y
@@ -5648,76 +5713,134 @@ CONFIG_VIDEO_SAA7164=m
 #
 # Media digital TV PCI Adapters
 #
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
 CONFIG_DVB_B2C2_FLEXCOP_PCI=m
 # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
 CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
 CONFIG_MANTIS_CORE=m
 CONFIG_DVB_MANTIS=m
 CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NETUP_UNIDVB=m
 CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
 CONFIG_DVB_SMIPCIE=m
-CONFIG_DVB_NETUP_UNIDVB=m
+# CONFIG_DVB_BUDGET_CORE is not set
 CONFIG_RADIO_ADAPTERS=y
+# CONFIG_RADIO_MAXIRADIO is not set
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_RADIO_SI4713=m
 CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
+CONFIG_USB_MR800=m
+CONFIG_USB_RAREMONO=m
 CONFIG_RADIO_SI470X=y
 CONFIG_USB_SI470X=m
 CONFIG_I2C_SI470X=m
-CONFIG_RADIO_SI4713=m
 CONFIG_USB_SI4713=m
 CONFIG_PLATFORM_SI4713=m
 CONFIG_I2C_SI4713=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-# CONFIG_RADIO_MAXIRADIO is not set
-CONFIG_RADIO_SHARK=m
-CONFIG_RADIO_SHARK2=m
-CONFIG_USB_KEENE=m
-CONFIG_USB_RAREMONO=m
-CONFIG_USB_MA901=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_WL1273=m
 CONFIG_RADIO_WL128X=m
-CONFIG_MEDIA_COMMON_OPTIONS=y
+CONFIG_MEDIA_PLATFORM_DRIVERS=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+# CONFIG_SDR_PLATFORM_DRIVERS is not set
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_MUX=m
 
 #
-# common driver options
+# Allegro DVT media platform drivers
+#
+
+#
+# Amlogic media platform drivers
+#
+# CONFIG_VIDEO_MESON_GE2D is not set
+
+#
+# Amphion drivers
+#
+# CONFIG_VIDEO_AMPHION_VPU is not set
+
+#
+# Aspeed media platform drivers
+#
+
+#
+# Atmel media platform drivers
+#
+
+#
+# Cadence media platform drivers
+#
+# CONFIG_VIDEO_CADENCE_CSI2RX is not set
+# CONFIG_VIDEO_CADENCE_CSI2TX is not set
+
+#
+# Chips&Media media platform drivers
+#
+CONFIG_VIDEO_CODA=m
+CONFIG_VIDEO_IMX_VDOA=m
+
+#
+# Intel media platform drivers
+#
+
+#
+# Marvell media platform drivers
 #
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_TTPCI_EEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_CAFE_CCIC=m
-# CONFIG_VIDEO_CADENCE is not set
-# CONFIG_VIDEO_ASPEED is not set
-CONFIG_VIDEO_MUX=m
-CONFIG_VIDEO_OMAP3=m
-# CONFIG_VIDEO_OMAP3_DEBUG is not set
+
+#
+# Mediatek media platform drivers
+#
+
+#
+# Microchip Technology, Inc. media platform drivers
+#
+
+#
+# NVidia media platform drivers
+#
+CONFIG_VIDEO_TEGRA_VDE=m
+
+#
+# NXP media platform drivers
+#
+CONFIG_VIDEO_IMX7_CSI=m
+# CONFIG_VIDEO_IMX_MIPI_CSIS is not set
+CONFIG_VIDEO_IMX_PXP=m
+# CONFIG_VIDEO_DW100 is not set
+# CONFIG_VIDEO_IMX8_JPEG is not set
+
+#
+# Qualcomm media platform drivers
+#
+
+#
+# Renesas media platform drivers
+#
+
+#
+# Rockchip media platform drivers
+#
+CONFIG_VIDEO_ROCKCHIP_RGA=m
 # CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+
+#
+# Samsung media platform drivers
+#
+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
 CONFIG_VIDEO_EXYNOS4_IS_COMMON=m
 CONFIG_VIDEO_S5P_FIMC=m
@@ -5725,36 +5848,57 @@ CONFIG_VIDEO_S5P_MIPI_CSIS=m
 CONFIG_VIDEO_EXYNOS_FIMC_LITE=m
 CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
 CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y
-CONFIG_VIDEO_AM437X_VPFE=m
-CONFIG_VIDEO_XILINX=m
-# CONFIG_VIDEO_XILINX_CSI2RXSS is not set
-CONFIG_VIDEO_XILINX_TPG=m
-CONFIG_VIDEO_XILINX_VTC=m
-CONFIG_VIDEO_SUN4I_CSI=m
-CONFIG_VIDEO_SUN6I_CSI=m
-# CONFIG_VIDEO_TI_CAL is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_CODA=m
-CONFIG_VIDEO_IMX_VDOA=m
-CONFIG_VIDEO_IMX_PXP=m
-# CONFIG_VIDEO_IMX8_JPEG is not set
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-# CONFIG_VIDEO_MESON_GE2D is not set
 # CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
-CONFIG_VIDEO_ROCKCHIP_RGA=m
-CONFIG_VIDEO_TI_VPE=m
-# CONFIG_VIDEO_TI_VPE_DEBUG is not set
+
+#
+# STMicroelectronics media platform drivers
+#
+CONFIG_DVB_C8SECTPFE=m
+
+#
+# Sunxi media platform drivers
+#
+CONFIG_VIDEO_SUN4I_CSI=m
+CONFIG_VIDEO_SUN6I_CSI=m
+# CONFIG_VIDEO_SUN6I_MIPI_CSI2 is not set
+# CONFIG_VIDEO_SUN8I_A83T_MIPI_CSI2 is not set
 # CONFIG_VIDEO_SUN8I_DEINTERLACE is not set
 # CONFIG_VIDEO_SUN8I_ROTATE is not set
+
+#
+# Texas Instruments drivers
+#
 CONFIG_VIDEO_TI_VPDMA=m
 CONFIG_VIDEO_TI_SC=m
 CONFIG_VIDEO_TI_CSC=m
-CONFIG_DVB_PLATFORM_DRIVERS=y
-CONFIG_DVB_C8SECTPFE=m
-# CONFIG_SDR_PLATFORM_DRIVERS is not set
+# CONFIG_VIDEO_TI_CAL is not set
+CONFIG_VIDEO_TI_VPE=m
+# CONFIG_VIDEO_TI_VPE_DEBUG is not set
+CONFIG_VIDEO_AM437X_VPFE=m
+CONFIG_VIDEO_OMAP3=m
+# CONFIG_VIDEO_OMAP3_DEBUG is not set
+
+#
+# Verisilicon media platform drivers
+#
+CONFIG_VIDEO_HANTRO=m
+# CONFIG_VIDEO_HANTRO_IMX8M is not set
+CONFIG_VIDEO_HANTRO_ROCKCHIP=y
+CONFIG_VIDEO_HANTRO_SUNXI=y
+
+#
+# VIA media platform drivers
+#
+
+#
+# Xilinx media platform drivers
+#
+CONFIG_VIDEO_XILINX=m
+# CONFIG_VIDEO_XILINX_CSI2RXSS is not set
+CONFIG_VIDEO_XILINX_TPG=m
+CONFIG_VIDEO_XILINX_VTC=m
 
 #
 # MMC/SDIO DVB adapters
@@ -5762,6 +5906,27 @@ CONFIG_DVB_C8SECTPFE=m
 CONFIG_SMS_SDIO_DRV=m
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_DVB_TEST_DRIVERS is not set
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_UVC_COMMON=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
 # end of Media drivers
 
 #
@@ -5775,24 +5940,118 @@ CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
+# Camera sensor devices
+#
+# CONFIG_VIDEO_AR0521 is not set
+# CONFIG_VIDEO_HI556 is not set
+# CONFIG_VIDEO_HI846 is not set
+# CONFIG_VIDEO_HI847 is not set
+# CONFIG_VIDEO_IMX208 is not set
+# CONFIG_VIDEO_IMX214 is not set
+# CONFIG_VIDEO_IMX219 is not set
+# CONFIG_VIDEO_IMX258 is not set
+# CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX290 is not set
+# CONFIG_VIDEO_IMX296 is not set
+# CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX334 is not set
+# CONFIG_VIDEO_IMX335 is not set
+# CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_IMX412 is not set
+# CONFIG_VIDEO_IMX415 is not set
+# CONFIG_VIDEO_MT9M001 is not set
+# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V032 is not set
+# CONFIG_VIDEO_MT9V111 is not set
+CONFIG_VIDEO_NOON010PC30=m
+# CONFIG_VIDEO_OG01A1B is not set
+# CONFIG_VIDEO_OV02A10 is not set
+# CONFIG_VIDEO_OV08D10 is not set
+# CONFIG_VIDEO_OV08X40 is not set
+# CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_OV13B10 is not set
+CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV4689 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV5648 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5675 is not set
+# CONFIG_VIDEO_OV5693 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV7251 is not set
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+# CONFIG_VIDEO_OV772X is not set
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV8858 is not set
+# CONFIG_VIDEO_OV8865 is not set
+# CONFIG_VIDEO_OV9282 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_RDACM20 is not set
+# CONFIG_VIDEO_RDACM21 is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+# CONFIG_VIDEO_S5C73M3 is not set
+# CONFIG_VIDEO_S5K5BAF is not set
+# CONFIG_VIDEO_S5K6A3 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+CONFIG_VIDEO_SR030PC30=m
+# CONFIG_VIDEO_ST_VGXY61 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_CCS is not set
+# CONFIG_VIDEO_ET8EK8 is not set
+# CONFIG_VIDEO_M5MOLS is not set
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+# CONFIG_VIDEO_AK7375 is not set
+# CONFIG_VIDEO_DW9714 is not set
+# CONFIG_VIDEO_DW9768 is not set
+# CONFIG_VIDEO_DW9807_VCM is not set
+# end of Lens drivers
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+# end of Flash devices
+
+#
 # Audio decoders, processors and mixers
 #
-CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
-# CONFIG_VIDEO_TDA1997X is not set
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS3308=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
 CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_UDA1342=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
 CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_WM8775=m
 # end of Audio decoders, processors and mixers
 
 #
@@ -5812,11 +6071,14 @@ CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 # CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_ISL7998X is not set
 CONFIG_VIDEO_KS0127=m
+# CONFIG_VIDEO_MAX9286 is not set
 # CONFIG_VIDEO_ML86V7667 is not set
 CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
 # CONFIG_VIDEO_TC358743 is not set
+# CONFIG_VIDEO_TC358746 is not set
 # CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
 # CONFIG_VIDEO_TVP7002 is not set
@@ -5825,7 +6087,6 @@ CONFIG_VIDEO_TW9903=m
 CONFIG_VIDEO_TW9906=m
 # CONFIG_VIDEO_TW9910 is not set
 CONFIG_VIDEO_VPX3220=m
-# CONFIG_VIDEO_MAX9286 is not set
 
 #
 # Video and audio decoders
@@ -5837,14 +6098,14 @@ CONFIG_VIDEO_CX25840=m
 #
 # Video encoders
 #
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
+# CONFIG_VIDEO_AD9389B is not set
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
 # CONFIG_VIDEO_ADV7343 is not set
 # CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_AD9389B is not set
 # CONFIG_VIDEO_AK881X is not set
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
 # CONFIG_VIDEO_THS8200 is not set
 # end of Video encoders
 
@@ -5870,107 +6131,17 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # Miscellaneous helper chips
 #
-# CONFIG_VIDEO_THS7303 is not set
-CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_I2C is not set
+CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_ST_MIPID02 is not set
+# CONFIG_VIDEO_THS7303 is not set
 # end of Miscellaneous helper chips
 
 #
-# Camera sensor devices
-#
-# CONFIG_VIDEO_HI556 is not set
-# CONFIG_VIDEO_HI846 is not set
-# CONFIG_VIDEO_IMX208 is not set
-# CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX219 is not set
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX290 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX334 is not set
-# CONFIG_VIDEO_IMX335 is not set
-# CONFIG_VIDEO_IMX355 is not set
-# CONFIG_VIDEO_IMX412 is not set
-# CONFIG_VIDEO_OV02A10 is not set
-CONFIG_VIDEO_OV2640=m
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV5648 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5693 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_OV7670=m
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV8865 is not set
-# CONFIG_VIDEO_OV9282 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_OV13B10 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
-# CONFIG_VIDEO_M5MOLS is not set
-# CONFIG_VIDEO_RDACM20 is not set
-# CONFIG_VIDEO_RDACM21 is not set
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_CCS is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
-# end of Camera sensor devices
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9768 is not set
-# CONFIG_VIDEO_DW9807_VCM is not set
-# end of Lens drivers
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-# end of Flash devices
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
-# end of SPI helper chips
-
-#
 # Media SPI Adapters
 #
 # CONFIG_CXD2880_SPI_DRV is not set
+# CONFIG_VIDEO_GS1662 is not set
 # end of Media SPI Adapters
 
 CONFIG_MEDIA_TUNER=y
@@ -5978,43 +6149,43 @@ CONFIG_MEDIA_TUNER=y
 #
 # Customize TV tuners
 #
-CONFIG_MEDIA_TUNER_SIMPLE=y
-CONFIG_MEDIA_TUNER_TDA18250=m
-CONFIG_MEDIA_TUNER_TDA8290=y
-CONFIG_MEDIA_TUNER_TDA827X=y
-CONFIG_MEDIA_TUNER_TDA18271=y
-CONFIG_MEDIA_TUNER_TDA9887=y
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_MC44S803=y
 CONFIG_MEDIA_TUNER_MSI001=m
-CONFIG_MEDIA_TUNER_MT20XX=y
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT20XX=y
 CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=y
-CONFIG_MEDIA_TUNER_XC5000=y
-CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=y
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_SIMPLE=y
 CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA18271=y
+CONFIG_MEDIA_TUNER_TDA827X=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
 CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-CONFIG_MEDIA_TUNER_QM1D1B0004=m
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_XC5000=y
 # end of Customize TV tuners
 
 #
@@ -6024,126 +6195,126 @@ CONFIG_MEDIA_TUNER_QM1D1B0004=m
 #
 # Multistandard (satellite) frontends
 #
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_MXL5XX=m
 CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
 CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV0910=m
 CONFIG_DVB_STV6110x=m
 CONFIG_DVB_STV6111=m
-CONFIG_DVB_MXL5XX=m
-CONFIG_DVB_M88DS3103=m
 
 #
 # Multistandard (cable + terrestrial) frontends
 #
 CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_TDA18271C2DD=m
 
 #
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
 CONFIG_DVB_CX24123=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
 CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
 CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
+CONFIG_DVB_SI21XX=m
 CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0288=m
 CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_TDA10071=m
 CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8083=m
 CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
 
 #
 # DVB-T (terrestrial) frontends
 #
-CONFIG_DVB_SP887X=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m
 # CONFIG_DVB_DIB9000 is not set
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
+CONFIG_DVB_DRXD=m
 CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_GP8PSK_FE=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_NXT6000=m
 CONFIG_DVB_RTL2830=m
 CONFIG_DVB_RTL2832=m
 CONFIG_DVB_RTL2832_SDR=m
+# CONFIG_DVB_S5H1432 is not set
 CONFIG_DVB_SI2168=m
-CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_ZD1301_DEMOD=m
-CONFIG_DVB_GP8PSK_FE=m
+CONFIG_DVB_ZL10353=m
 # CONFIG_DVB_CXD2880 is not set
 
 #
 # DVB-C (cable) frontends
 #
-CONFIG_DVB_VES1820=m
+CONFIG_DVB_STV0297=m
 CONFIG_DVB_TDA10021=m
 CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
+CONFIG_DVB_VES1820=m
 
 #
 # ATSC (North American/Korean Terrestrial/Cable DTV) frontends
 #
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
 CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LG2160=m
 CONFIG_DVB_LGDT3305=m
 CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_MXL692=m
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_OR51211=m
 CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
 CONFIG_DVB_S5H1411=m
-CONFIG_DVB_MXL692=m
 
 #
 # ISDB-T (terrestrial) frontends
 #
-CONFIG_DVB_S921=m
 CONFIG_DVB_DIB8000=m
 CONFIG_DVB_MB86A20S=m
+CONFIG_DVB_S921=m
 
 #
 # ISDB-S (satellite) & ISDB-T (terrestrial) frontends
 #
-CONFIG_DVB_TC90522=m
 # CONFIG_DVB_MN88443X is not set
+CONFIG_DVB_TC90522=m
 
 #
 # Digital terrestrial only tuners/PLL
@@ -6155,25 +6326,25 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_LNBH25=m
-# CONFIG_DVB_LNBH29 is not set
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_HELENE=m
+CONFIG_DVB_HORUS3A=m
 CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
+CONFIG_DVB_IX2505V=m
 # CONFIG_DVB_LGS8GL5 is not set
 CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
+CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
 CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_HORUS3A=m
-CONFIG_DVB_ASCOT2E=m
-CONFIG_DVB_HELENE=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_DRX39XYJ=m
 
 #
 # Common Interface (EN50221) controller drivers
@@ -6191,18 +6362,16 @@ CONFIG_DVB_DUMMY_FE=m
 #
 # Graphics support
 #
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_APERTURE_HELPERS=y
+CONFIG_VIDEO_NOMODESET=y
+CONFIG_TEGRA_HOST1X_CONTEXT_BUS=y
 CONFIG_TEGRA_HOST1X=m
 CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_IMX_IPUV3_CORE=m
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DBI=m
 CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_DP_AUX_BUS=y
-CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
@@ -6210,11 +6379,16 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_DP_AUX_BUS=y
+CONFIG_DRM_DISPLAY_HELPER=y
+CONFIG_DRM_DISPLAY_DP_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_TTM=m
 CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_TTM_HELPER=m
-CONFIG_DRM_GEM_CMA_HELPER=m
+CONFIG_DRM_GEM_DMA_HELPER=m
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y
 
@@ -6238,7 +6412,6 @@ CONFIG_DRM_MALI_DISPLAY=m
 # CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_AMDGPU is not set
 CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
@@ -6274,6 +6447,8 @@ CONFIG_DRM_EXYNOS_HDMI=y
 # CONFIG_DRM_EXYNOS_ROTATOR is not set
 # CONFIG_DRM_EXYNOS_SCALER is not set
 CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_VOP=y
+# CONFIG_ROCKCHIP_VOP2 is not set
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 # CONFIG_ROCKCHIP_CDN_DP is not set
 CONFIG_ROCKCHIP_DW_HDMI=y
@@ -6286,9 +6461,6 @@ CONFIG_DRM_UDL=m
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_MGAG200 is not set
 CONFIG_DRM_ARMADA=m
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_USE_LVDS is not set
-# CONFIG_DRM_RCAR_MIPI_DSI is not set
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
@@ -6315,9 +6487,11 @@ CONFIG_DRM_QXL=m
 CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_MSM=y
 CONFIG_DRM_MSM_GPU_STATE=y
-# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
 # CONFIG_DRM_MSM_GPU_SUDO is not set
-CONFIG_DRM_MSM_HDMI_HDCP=y
+CONFIG_DRM_MSM_MDSS=y
+CONFIG_DRM_MSM_MDP4=y
+CONFIG_DRM_MSM_MDP5=y
+CONFIG_DRM_MSM_DPU=y
 CONFIG_DRM_MSM_DP=y
 CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_DSI_28NM_PHY=y
@@ -6326,6 +6500,8 @@ CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
 CONFIG_DRM_MSM_DSI_14NM_PHY=y
 CONFIG_DRM_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_MSM_DSI_7NM_PHY=y
+CONFIG_DRM_MSM_HDMI=y
+CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_FSL_DCU=m
 CONFIG_DRM_TEGRA=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
@@ -6340,6 +6516,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
+# CONFIG_DRM_PANEL_AUO_A030JTN01 is not set
 # CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
@@ -6347,14 +6524,17 @@ CONFIG_DRM_PANEL_ARM_VERSATILE=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_PANEL_EDP=y
+# CONFIG_DRM_PANEL_EBBG_FT8719 is not set
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
+# CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
+# CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
@@ -6365,12 +6545,16 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
+# CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
+# CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
+# CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
 # CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
@@ -6396,7 +6580,6 @@ CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
@@ -6405,6 +6588,7 @@ CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
+# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
 # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 # end of Display Panels
@@ -6415,12 +6599,14 @@ CONFIG_DRM_PANEL_BRIDGE=y
 #
 # Display Interface Bridges
 #
-# CONFIG_DRM_CDNS_DSI is not set
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_CROS_EC_ANX7688 is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
+# CONFIG_DRM_FSL_LDB is not set
+# CONFIG_DRM_ITE_IT6505 is not set
 # CONFIG_DRM_LONTIUM_LT8912B is not set
+# CONFIG_DRM_LONTIUM_LT9211 is not set
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 # CONFIG_DRM_LONTIUM_LT9611UXC is not set
 # CONFIG_DRM_ITE_IT66121 is not set
@@ -6440,6 +6626,7 @@ CONFIG_DRM_TOSHIBA_TC358764=m
 CONFIG_DRM_TOSHIBA_TC358767=m
 CONFIG_DRM_TOSHIBA_TC358768=m
 # CONFIG_DRM_TOSHIBA_TC358775 is not set
+# CONFIG_DRM_TI_DLPC3433 is not set
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_TI_SN65DSI83 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
@@ -6451,10 +6638,16 @@ CONFIG_DRM_ANALOGIX_DP=y
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
+# CONFIG_DRM_CDNS_DSI is not set
 # CONFIG_DRM_CDNS_MHDP8546 is not set
+# CONFIG_DRM_IMX8QM_LDB is not set
+# CONFIG_DRM_IMX8QXP_LDB is not set
+# CONFIG_DRM_IMX8QXP_PIXEL_COMBINER is not set
+# CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI is not set
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+# CONFIG_DRM_DW_HDMI_GP_AUDIO is not set
 CONFIG_DRM_DW_HDMI_CEC=m
 CONFIG_DRM_DW_MIPI_DSI=m
 # end of Display Interface Bridges
@@ -6465,19 +6658,22 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
 CONFIG_DRM_IMX_LDB=m
 CONFIG_DRM_IMX_HDMI=m
-# CONFIG_DRM_V3D is not set
+CONFIG_DRM_V3D=m
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_ETNAVIV_THERMAL=y
+# CONFIG_DRM_LOGICVC is not set
 CONFIG_DRM_MXS=y
 CONFIG_DRM_MXSFB=m
+# CONFIG_DRM_IMX_LCDIF is not set
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MESON_DW_HDMI=m
 # CONFIG_DRM_ARCPGU is not set
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_GM12U320=m
+# CONFIG_DRM_PANEL_MIPI_DBI is not set
 CONFIG_DRM_SIMPLEDRM=y
 CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9163=m
@@ -6495,14 +6691,9 @@ CONFIG_DRM_PANFROST=m
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
+# CONFIG_DRM_SSD130X is not set
 CONFIG_DRM_LEGACY=y
-# CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_VIA is not set
-# CONFIG_DRM_SAVAGE is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-CONFIG_DRM_NOMODESET=y
 
 #
 # Frame buffer Devices
@@ -6597,6 +6788,7 @@ CONFIG_LCD_PLATFORM=y
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_KTD253 is not set
+# CONFIG_BACKLIGHT_KTZ8866 is not set
 CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_DA9052 is not set
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
@@ -6635,6 +6827,7 @@ CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_LOGO_LINUX_CLUT224=y
 # end of Graphics support
 
+# CONFIG_DRM_ACCEL is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_TIMER=m
@@ -6656,7 +6849,9 @@ CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_CTL_FAST_LOOKUP=y
 # CONFIG_SND_DEBUG is not set
+# CONFIG_SND_CTL_INPUT_VALIDATION is not set
 CONFIG_SND_VMASTER=y
 CONFIG_SND_CTL_LED=m
 CONFIG_SND_SEQUENCER=m
@@ -6676,6 +6871,7 @@ CONFIG_SND_ALOOP=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_MTPAV=m
 CONFIG_SND_SERIAL_U16550=m
+# CONFIG_SND_SERIAL_GENERIC is not set
 CONFIG_SND_MPU401=m
 # CONFIG_SND_AC97_POWER_SAVE is not set
 CONFIG_SND_PCI=y
@@ -6823,6 +7019,7 @@ CONFIG_SND_SOC_FSL_ESAI=m
 # CONFIG_SND_SOC_FSL_EASRC is not set
 # CONFIG_SND_SOC_FSL_XCVR is not set
 # CONFIG_SND_SOC_FSL_AUD2HTX is not set
+CONFIG_SND_SOC_FSL_UTILS=m
 # CONFIG_SND_SOC_FSL_RPMSG is not set
 CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
@@ -6903,6 +7100,7 @@ CONFIG_SND_SUN8I_CODEC=m
 CONFIG_SND_SUN8I_CODEC_ANALOG=m
 CONFIG_SND_SUN4I_I2S=m
 CONFIG_SND_SUN4I_SPDIF=m
+# CONFIG_SND_SUN50I_DMIC is not set
 CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m
 # end of Allwinner SoC Audio support
 
@@ -6916,6 +7114,8 @@ CONFIG_SND_SOC_TEGRA30_I2S=m
 # CONFIG_SND_SOC_TEGRA210_AHUB is not set
 # CONFIG_SND_SOC_TEGRA210_DMIC is not set
 # CONFIG_SND_SOC_TEGRA210_I2S is not set
+# CONFIG_SND_SOC_TEGRA210_OPE is not set
+# CONFIG_SND_SOC_TEGRA186_ASRC is not set
 # CONFIG_SND_SOC_TEGRA186_DSPK is not set
 # CONFIG_SND_SOC_TEGRA210_ADMAIF is not set
 # CONFIG_SND_SOC_TEGRA210_MVC is not set
@@ -6970,7 +7170,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CODEC drivers
 #
 CONFIG_SND_SOC_WM_HUBS=m
-# CONFIG_SND_SOC_AC97_CODEC is not set
+CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_ADAU1372_I2C is not set
 # CONFIG_SND_SOC_ADAU1372_SPI is not set
 CONFIG_SND_SOC_ADAU1701=m
@@ -6990,6 +7190,8 @@ CONFIG_SND_SOC_AK4554=m
 # CONFIG_SND_SOC_AK5558 is not set
 # CONFIG_SND_SOC_ALC5623 is not set
 CONFIG_SND_SOC_ALC5632=m
+# CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88395 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CROS_EC_CODEC=m
@@ -7000,12 +7202,15 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 # CONFIG_SND_SOC_CS35L36 is not set
 # CONFIG_SND_SOC_CS35L41_SPI is not set
 # CONFIG_SND_SOC_CS35L41_I2C is not set
+# CONFIG_SND_SOC_CS35L45_SPI is not set
+# CONFIG_SND_SOC_CS35L45_I2C is not set
 # CONFIG_SND_SOC_CS42L42 is not set
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS42L51_I2C=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS42L83 is not set
 # CONFIG_SND_SOC_CS4234 is not set
 CONFIG_SND_SOC_CS4265=m
 # CONFIG_SND_SOC_CS4270 is not set
@@ -7024,11 +7229,14 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8316 is not set
+# CONFIG_SND_SOC_ES8326 is not set
 CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_HDA is not set
 # CONFIG_SND_SOC_ICS43432 is not set
+# CONFIG_SND_SOC_IDT821034 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 CONFIG_SND_SOC_MAX98090=m
@@ -7040,6 +7248,7 @@ CONFIG_SND_SOC_MAX98095=m
 # CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX98373_I2C is not set
 # CONFIG_SND_SOC_MAX98390 is not set
+# CONFIG_SND_SOC_MAX98396 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_PCM1681 is not set
@@ -7056,6 +7265,7 @@ CONFIG_SND_SOC_PCM5102A=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 CONFIG_SND_SOC_PCM512x_SPI=m
+# CONFIG_SND_SOC_PEB2466 is not set
 # CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RK817 is not set
 CONFIG_SND_SOC_RL6231=m
@@ -7072,7 +7282,9 @@ CONFIG_SND_SOC_SIGMADSP=m
 CONFIG_SND_SOC_SIGMADSP_I2C=m
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
+# CONFIG_SND_SOC_SMA1303 is not set
 CONFIG_SND_SOC_SPDIF=m
+# CONFIG_SND_SOC_SRC4XXX_I2C is not set
 # CONFIG_SND_SOC_SSM2305 is not set
 # CONFIG_SND_SOC_SSM2518 is not set
 # CONFIG_SND_SOC_SSM2602_SPI is not set
@@ -7085,9 +7297,11 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_TAS2562 is not set
 # CONFIG_SND_SOC_TAS2764 is not set
 # CONFIG_SND_SOC_TAS2770 is not set
+# CONFIG_SND_SOC_TAS2780 is not set
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
 # CONFIG_SND_SOC_TAS5720 is not set
+# CONFIG_SND_SOC_TAS5805M is not set
 # CONFIG_SND_SOC_TAS6424 is not set
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
@@ -7115,7 +7329,8 @@ CONFIG_SND_SOC_TWL6040=m
 # CONFIG_SND_SOC_WM8580 is not set
 # CONFIG_SND_SOC_WM8711 is not set
 # CONFIG_SND_SOC_WM8728 is not set
-CONFIG_SND_SOC_WM8731=m
+# CONFIG_SND_SOC_WM8731_I2C is not set
+# CONFIG_SND_SOC_WM8731_SPI is not set
 # CONFIG_SND_SOC_WM8737 is not set
 # CONFIG_SND_SOC_WM8741 is not set
 # CONFIG_SND_SOC_WM8750 is not set
@@ -7128,7 +7343,9 @@ CONFIG_SND_SOC_WM8804_I2C=m
 CONFIG_SND_SOC_WM8804_SPI=m
 CONFIG_SND_SOC_WM8903=m
 # CONFIG_SND_SOC_WM8904 is not set
+# CONFIG_SND_SOC_WM8940 is not set
 # CONFIG_SND_SOC_WM8960 is not set
+# CONFIG_SND_SOC_WM8961 is not set
 CONFIG_SND_SOC_WM8962=m
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
@@ -7160,10 +7377,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_TEST_COMPONENT is not set
 # CONFIG_SND_VIRTIO is not set
 CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
@@ -7200,6 +7414,7 @@ CONFIG_HID_EMS_FF=m
 # CONFIG_HID_ELAN is not set
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
+# CONFIG_HID_EVISION is not set
 CONFIG_HID_EZKEY=m
 CONFIG_HID_FT260=m
 CONFIG_HID_GEMBIRD=m
@@ -7207,6 +7422,7 @@ CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GLORIOUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
+CONFIG_HID_VIVALDI_COMMON=m
 # CONFIG_HID_GOOGLE_HAMMER is not set
 CONFIG_HID_VIVALDI=m
 # CONFIG_HID_GT683R is not set
@@ -7215,6 +7431,7 @@ CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_VIEWSONIC=m
+# CONFIG_HID_VRC2 is not set
 CONFIG_HID_XIAOMI=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_ICADE=m
@@ -7236,12 +7453,13 @@ CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MALTRON=m
 # CONFIG_HID_MAYFLASH is not set
+CONFIG_HID_MEGAWORLD_FF=m
 CONFIG_HID_REDRAGON=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NINTENDO=m
-# CONFIG_NINTENDO_FF is not set
+CONFIG_NINTENDO_FF=y
 CONFIG_HID_NTI=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
@@ -7258,16 +7476,20 @@ CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PLAYSTATION=m
 CONFIG_PLAYSTATION_FF=y
+# CONFIG_HID_PXRC is not set
+CONFIG_HID_RAZER=m
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_RETRODE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SEMITEK=m
+CONFIG_HID_SIGMAMICRO=m
 CONFIG_HID_SONY=m
 CONFIG_SONY_FF=y
 CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_STEAM=m
+# CONFIG_STEAM_FF is not set
 CONFIG_HID_STEELSERIES=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_RMI=m
@@ -7277,6 +7499,7 @@ CONFIG_HID_SMARTJOYPLUS=m
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TIVO=m
 CONFIG_HID_TOPSEED=m
+CONFIG_HID_TOPRE=m
 CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
@@ -7295,6 +7518,11 @@ CONFIG_HID_MCP2221=m
 # end of Special HID drivers
 
 #
+# HID-BPF support
+#
+# end of HID-BPF support
+
+#
 # USB HID support
 #
 CONFIG_USB_HID=y
@@ -7302,16 +7530,11 @@ CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
 # end of USB HID support
 
-#
-# I2C HID support
-#
+CONFIG_I2C_HID=y
 CONFIG_I2C_HID_OF=y
+# CONFIG_I2C_HID_OF_ELAN is not set
 # CONFIG_I2C_HID_OF_GOODIX is not set
-# end of I2C HID support
-
 CONFIG_I2C_HID_CORE=y
-# end of HID support
-
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -7360,7 +7583,6 @@ CONFIG_USB_EHCI_EXYNOS=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_MAX3421_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_OMAP3=y
@@ -7420,6 +7642,10 @@ CONFIG_USBIP_VHCI_NR_HCS=8
 CONFIG_USBIP_HOST=m
 CONFIG_USBIP_VUDC=m
 # CONFIG_USBIP_DEBUG is not set
+
+#
+# USB dual-mode controller drivers
+#
 # CONFIG_USB_CDNS_SUPPORT is not set
 CONFIG_USB_MUSB_HDRC=y
 # CONFIG_USB_MUSB_HOST is not set
@@ -7432,7 +7658,6 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_SUNXI=y
 CONFIG_USB_MUSB_TUSB6010=y
 CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_USB_MUSB_AM35X=y
 CONFIG_USB_MUSB_DSPS=y
 
 #
@@ -7570,6 +7795,7 @@ CONFIG_USB_HSIC_USB3503=y
 CONFIG_USB_HSIC_USB4604=y
 # CONFIG_USB_LINK_LAYER_TEST is not set
 CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ONBOARD_HUB=m
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
@@ -7584,7 +7810,6 @@ CONFIG_NOP_USB_XCEIV=y
 CONFIG_AM335X_CONTROL_USB=m
 CONFIG_AM335X_PHY_USB=m
 CONFIG_TWL6030_USB=m
-CONFIG_USB_GPIO_VBUS=y
 CONFIG_USB_ISP1301=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_TEGRA_PHY=y
@@ -7604,7 +7829,6 @@ CONFIG_U_SERIAL_CONSOLE=y
 # USB Peripheral Controller
 #
 # CONFIG_USB_FUSB300 is not set
-# CONFIG_USB_FOTG210_UDC is not set
 # CONFIG_USB_GR_UDC is not set
 # CONFIG_USB_R8A66597 is not set
 # CONFIG_USB_PXA27X is not set
@@ -7704,14 +7928,21 @@ CONFIG_USB_G_WEBCAM=m
 
 CONFIG_TYPEC=y
 # CONFIG_TYPEC_TCPM is not set
-# CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC_UCSI=m
+# CONFIG_UCSI_CCG is not set
+CONFIG_UCSI_STM32G0=m
 # CONFIG_TYPEC_TPS6598X is not set
+# CONFIG_TYPEC_ANX7411 is not set
+# CONFIG_TYPEC_RT1719 is not set
 CONFIG_TYPEC_HD3SS3220=y
 # CONFIG_TYPEC_STUSB160X is not set
+# CONFIG_TYPEC_WUSB3801 is not set
 
 #
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
+# CONFIG_TYPEC_MUX_FSA4480 is not set
+# CONFIG_TYPEC_MUX_GPIO_SBU is not set
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
@@ -7743,7 +7974,6 @@ CONFIG_MMC_SDHCI_PCI=y
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y
-# CONFIG_MMC_SDHCI_OF_ASPEED is not set
 CONFIG_MMC_SDHCI_OF_AT91=y
 CONFIG_MMC_SDHCI_OF_ESDHC=y
 # CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
@@ -7788,6 +8018,13 @@ CONFIG_MMC_BCM2835=y
 CONFIG_MMC_SDHCI_OMAP=y
 # CONFIG_MMC_SDHCI_AM654 is not set
 CONFIG_MMC_SDHCI_EXTERNAL_DMA=y
+CONFIG_SCSI_UFSHCD=m
+# CONFIG_SCSI_UFS_BSG is not set
+# CONFIG_SCSI_UFS_HPB is not set
+# CONFIG_SCSI_UFS_HWMON is not set
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFSHCD_PLATFORM is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -7877,6 +8114,11 @@ CONFIG_LEDS_MAX77693=m
 # CONFIG_LEDS_SGM3140 is not set
 
 #
+# RGB LED drivers
+#
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+
+#
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
@@ -7954,6 +8196,7 @@ CONFIG_RTC_DRV_MAX8907=m
 CONFIG_RTC_DRV_MAX8998=m
 CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_MAX77686=y
+# CONFIG_RTC_DRV_NCT3018Y is not set
 CONFIG_RTC_DRV_RK808=y
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -8040,7 +8283,6 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MSM6242=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_ZYNQMP=m
 CONFIG_RTC_DRV_CROS_EC=y
 
@@ -8066,6 +8308,7 @@ CONFIG_RTC_DRV_TEGRA=y
 CONFIG_RTC_DRV_MXC=y
 CONFIG_RTC_DRV_MXC_V2=y
 CONFIG_RTC_DRV_SNVS=y
+# CONFIG_RTC_DRV_BBNSM is not set
 CONFIG_RTC_DRV_R7301=y
 
 #
@@ -8104,6 +8347,7 @@ CONFIG_PL330_DMA=y
 # CONFIG_PLX_DMA is not set
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_XILINX_DMA=y
+# CONFIG_XILINX_XDMA is not set
 CONFIG_XILINX_ZYNQMP_DMA=y
 # CONFIG_XILINX_ZYNQMP_DPDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
@@ -8112,7 +8356,6 @@ CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 # CONFIG_DW_DMAC_PCI is not set
 # CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
 # CONFIG_SF_PDMA is not set
 CONFIG_TI_CPPI41=y
 CONFIG_TI_EDMA=y
@@ -8164,6 +8407,7 @@ CONFIG_UIO_NETX=m
 CONFIG_UIO_MF624=m
 # CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI_LIB=y
 CONFIG_VIRTIO_PCI_LIB_LEGACY=y
@@ -8199,7 +8443,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
-CONFIG_R8188EU=m
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@@ -8219,7 +8462,6 @@ CONFIG_ADIS16240=m
 # Analog to digital converters
 #
 CONFIG_AD7816=m
-CONFIG_AD7280=m
 # end of Analog to digital converters
 
 #
@@ -8231,12 +8473,6 @@ CONFIG_ADT7316_I2C=m
 # end of Analog digital bi-direction converters
 
 #
-# Capacitance to digital converters
-#
-CONFIG_AD7746=m
-# end of Capacitance to digital converters
-
-#
 # Direct Digital Synthesis
 #
 CONFIG_AD9832=m
@@ -8271,44 +8507,27 @@ CONFIG_SERIO_NVEC_PS2=m
 CONFIG_NVEC_POWER=m
 CONFIG_NVEC_PAZ00=m
 CONFIG_STAGING_MEDIA=y
-CONFIG_VIDEO_HANTRO=m
-# CONFIG_VIDEO_HANTRO_IMX8M is not set
-CONFIG_VIDEO_HANTRO_ROCKCHIP=y
-CONFIG_VIDEO_HANTRO_SUNXI=y
+# CONFIG_DVB_AV7110 is not set
 CONFIG_VIDEO_IMX_MEDIA=m
 
 #
 # i.MX5/6/7/8 Media Sub devices
 #
 CONFIG_VIDEO_IMX_CSI=m
-CONFIG_VIDEO_IMX7_CSI=m
 # end of i.MX5/6/7/8 Media Sub devices
 
+# CONFIG_VIDEO_IMX8MQ_MIPI_CSI2 is not set
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MESON_VDEC is not set
 CONFIG_VIDEO_OMAP4=m
 # CONFIG_VIDEO_ROCKCHIP_VDEC is not set
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=m
-CONFIG_TEGRA_VDE=m
-# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_SUN6I_ISP is not set
 # CONFIG_VIDEO_TEGRA is not set
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_SP8870=m
-
-#
-# Android
-#
-# end of Android
-
+# CONFIG_STAGING_MEDIA_DEPRECATED is not set
 # CONFIG_STAGING_BOARD is not set
 CONFIG_LTE_GDM724X=m
-CONFIG_GS_FPGABOOT=m
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_FB_TFT=m
 CONFIG_FB_TFT_AGM1264K_FL=m
 CONFIG_FB_TFT_BD663474=m
@@ -8352,7 +8571,7 @@ CONFIG_BCM2835_VCHIQ_MMAL=m
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
 CONFIG_QLGE=m
-CONFIG_WFX=m
+# CONFIG_VME_BUS is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CROS_EC=y
@@ -8360,6 +8579,7 @@ CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_PROTO=y
+# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
 CONFIG_CROS_EC_CHARDEV=y
 CONFIG_CROS_EC_LIGHTBAR=m
 CONFIG_CROS_EC_VBC=m
@@ -8367,6 +8587,7 @@ CONFIG_CROS_EC_DEBUGFS=m
 CONFIG_CROS_EC_SENSORHUB=y
 CONFIG_CROS_EC_SYSFS=m
 CONFIG_CROS_EC_TYPEC=y
+# CONFIG_CROS_HPS_I2C is not set
 CONFIG_CROS_USBPD_NOTIFY=y
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_HAVE_CLK=y
@@ -8394,14 +8615,15 @@ CONFIG_COMMON_CLK_SI5351=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_LAN966X is not set
 CONFIG_COMMON_CLK_S2MPS11=y
 CONFIG_CLK_TWL6040=y
 CONFIG_COMMON_CLK_AXI_CLKGEN=y
 CONFIG_CLK_QORIQ=y
 CONFIG_COMMON_CLK_PALMAS=y
 CONFIG_COMMON_CLK_PWM=y
+# CONFIG_COMMON_CLK_RS9_PCIE is not set
 # CONFIG_COMMON_CLK_VC5 is not set
+# CONFIG_COMMON_CLK_VC7 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_CLK_BCM2711_DVP=y
 CONFIG_CLK_BCM2835=y
@@ -8421,6 +8643,7 @@ CONFIG_CLK_VF610=y
 # CONFIG_CLK_IMX8MP is not set
 # CONFIG_CLK_IMX8MQ is not set
 # CONFIG_CLK_IMX8ULP is not set
+# CONFIG_CLK_IMX93 is not set
 
 #
 # Clock support for Amlogic platforms
@@ -8438,6 +8661,7 @@ CONFIG_ARMADA_38X_CLK=y
 CONFIG_ARMADA_39X_CLK=y
 CONFIG_COMMON_CLK_ROCKCHIP=y
 CONFIG_CLK_RV110X=y
+CONFIG_CLK_RV1126=y
 CONFIG_CLK_RK3036=y
 CONFIG_CLK_RK312X=y
 CONFIG_CLK_RK3188=y
@@ -8459,9 +8683,12 @@ CONFIG_CLK_SUNXI_PRCM_SUN6I=y
 CONFIG_CLK_SUNXI_PRCM_SUN8I=y
 CONFIG_CLK_SUNXI_PRCM_SUN9I=y
 CONFIG_SUNXI_CCU=y
+CONFIG_SUN20I_D1_CCU=y
+CONFIG_SUN20I_D1_R_CCU=y
 CONFIG_SUN4I_A10_CCU=y
 CONFIG_SUN5I_CCU=y
 CONFIG_SUN6I_A31_CCU=y
+CONFIG_SUN6I_RTC_CCU=y
 CONFIG_SUN8I_A23_CCU=y
 CONFIG_SUN8I_A33_CCU=y
 CONFIG_SUN8I_A83T_CCU=y
@@ -8475,6 +8702,7 @@ CONFIG_TEGRA_CLK_DFLL=y
 CONFIG_TEGRA124_CLK_EMC=y
 CONFIG_COMMON_CLK_TI_ADPLL=y
 # CONFIG_XILINX_VCU is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_OMAP=y
 # CONFIG_HWSPINLOCK_SUN6I is not set
@@ -8484,9 +8712,10 @@ CONFIG_HWSPINLOCK_OMAP=y
 #
 CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
-CONFIG_OMAP_DM_TIMER=y
+CONFIG_OMAP_DM_SYSTIMER=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_BCM2835_TIMER=y
+CONFIG_OMAP_DM_TIMER=y
 CONFIG_DW_APB_TIMER=y
 CONFIG_DW_APB_TIMER_OF=y
 CONFIG_ROCKCHIP_TIMER=y
@@ -8495,6 +8724,7 @@ CONFIG_MESON6_TIMER=y
 CONFIG_SUN4I_TIMER=y
 CONFIG_SUN5I_HSTIMER=y
 CONFIG_TEGRA_TIMER=y
+# CONFIG_TEGRA186_TIMER is not set
 CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_CLKSRC_TI_32K=y
 CONFIG_ARM_ARCH_TIMER=y
@@ -8544,6 +8774,7 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
+# CONFIG_IOMMUFD is not set
 CONFIG_OMAP_IOMMU=y
 # CONFIG_OMAP_IOMMU_DEBUG is not set
 CONFIG_ROCKCHIP_IOMMU=y
@@ -8573,6 +8804,7 @@ CONFIG_PRU_REMOTEPROC=m
 #
 CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
+# CONFIG_RPMSG_CTRL is not set
 CONFIG_RPMSG_NS=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
@@ -8611,10 +8843,16 @@ CONFIG_FSL_GUTS=y
 # end of NXP/Freescale QorIQ SoC drivers
 
 #
+# fujitsu SoC drivers
+#
+# end of fujitsu SoC drivers
+
+#
 # i.MX SoC drivers
 #
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
 # CONFIG_SOC_IMX8M is not set
+# CONFIG_SOC_IMX9 is not set
 # end of i.MX SoC drivers
 
 #
@@ -8623,9 +8861,12 @@ CONFIG_IMX_GPCV2_PM_DOMAINS=y
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 # end of Enable LiteX SoC Builder specific drivers
 
+# CONFIG_WPCM450_SOC is not set
+
 #
 # Qualcomm SoC drivers
 #
+# CONFIG_QCOM_PMIC_GLINK is not set
 CONFIG_QCOM_QMI_HELPERS=m
 # end of Qualcomm SoC drivers
 
@@ -8642,6 +8883,7 @@ CONFIG_EXYNOS_PM_DOMAINS=y
 CONFIG_EXYNOS_REGULATOR_COUPLER=y
 CONFIG_SUNXI_MBUS=y
 CONFIG_SUNXI_SRAM=y
+# CONFIG_SUN20I_PPU is not set
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
@@ -8747,6 +8989,9 @@ CONFIG_ADXL313_SPI=m
 CONFIG_ADXL355=m
 CONFIG_ADXL355_I2C=m
 CONFIG_ADXL355_SPI=m
+CONFIG_ADXL367=m
+CONFIG_ADXL367_SPI=m
+CONFIG_ADXL367_I2C=m
 CONFIG_ADXL372=m
 CONFIG_ADXL372_SPI=m
 CONFIG_ADXL372_I2C=m
@@ -8772,6 +9017,8 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+# CONFIG_IIO_KX022A_SPI is not set
+# CONFIG_IIO_KX022A_I2C is not set
 CONFIG_KXSD9=m
 CONFIG_KXSD9_SPI=m
 CONFIG_KXSD9_I2C=m
@@ -8785,6 +9032,7 @@ CONFIG_MMA8452=m
 CONFIG_MMA9551_CORE=m
 CONFIG_MMA9551=m
 CONFIG_MMA9553=m
+# CONFIG_MSA311 is not set
 CONFIG_MXC4005=m
 CONFIG_MXC6255=m
 CONFIG_SCA3000=m
@@ -8797,10 +9045,12 @@ CONFIG_STK8BA50=m
 # Analog to digital converters
 #
 CONFIG_AD_SIGMA_DELTA=m
+# CONFIG_AD4130 is not set
 CONFIG_AD7091R5=m
 CONFIG_AD7124=m
 CONFIG_AD7192=m
 CONFIG_AD7266=m
+CONFIG_AD7280=m
 CONFIG_AD7291=m
 CONFIG_AD7292=m
 CONFIG_AD7298=m
@@ -8830,6 +9080,7 @@ CONFIG_HX711=m
 CONFIG_INA2XX_ADC=m
 CONFIG_IMX7D_ADC=m
 CONFIG_IMX8QXP_ADC=m
+# CONFIG_IMX93_ADC is not set
 CONFIG_LTC2471=m
 CONFIG_LTC2485=m
 CONFIG_LTC2496=m
@@ -8837,6 +9088,8 @@ CONFIG_LTC2497=m
 CONFIG_MAX1027=m
 CONFIG_MAX11100=m
 CONFIG_MAX1118=m
+# CONFIG_MAX11205 is not set
+# CONFIG_MAX11410 is not set
 CONFIG_MAX1241=m
 CONFIG_MAX1363=m
 CONFIG_MAX9611=m
@@ -8848,6 +9101,7 @@ CONFIG_NAU7802=m
 CONFIG_PALMAS_GPADC=m
 CONFIG_RN5T618_ADC=m
 CONFIG_ROCKCHIP_SARADC=m
+# CONFIG_RICHTEK_RTQ6056 is not set
 CONFIG_SD_ADC_MODULATOR=m
 CONFIG_STMPE_ADC=m
 CONFIG_SUN4I_GPADC=m
@@ -8859,12 +9113,14 @@ CONFIG_TI_ADC108S102=m
 CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
+# CONFIG_TI_ADS7924 is not set
 CONFIG_TI_ADS7950=m
 CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_ADS124S08=m
 CONFIG_TI_ADS131E08=m
 CONFIG_TI_AM335X_ADC=m
+# CONFIG_TI_LMP92064 is not set
 CONFIG_TI_TLC4541=m
 CONFIG_TI_TSC2046=m
 CONFIG_TWL4030_MADC=m
@@ -8876,6 +9132,7 @@ CONFIG_XILINX_XADC=m
 #
 # Analog to digital and digital to analog converters
 #
+# CONFIG_AD74115 is not set
 CONFIG_AD74413R=m
 # end of Analog to digital and digital to analog converters
 
@@ -8889,6 +9146,7 @@ CONFIG_IIO_RESCALE=m
 # Amplifiers
 #
 CONFIG_AD8366=m
+CONFIG_ADA4250=m
 CONFIG_HMC425=m
 # end of Amplifiers
 
@@ -8896,6 +9154,7 @@ CONFIG_HMC425=m
 # Capacitance to digital converters
 #
 CONFIG_AD7150=m
+CONFIG_AD7746=m
 # end of Capacitance to digital converters
 
 #
@@ -8967,6 +9226,7 @@ CONFIG_AD5592R=m
 CONFIG_AD5593R=m
 CONFIG_AD5504=m
 CONFIG_AD5624R_SPI=m
+CONFIG_LTC2688=m
 CONFIG_AD5686=m
 CONFIG_AD5686_SPI=m
 CONFIG_AD5696_I2C=m
@@ -8986,6 +9246,7 @@ CONFIG_LTC1660=m
 CONFIG_LTC2632=m
 CONFIG_M62332=m
 CONFIG_MAX517=m
+# CONFIG_MAX5522 is not set
 CONFIG_MAX5821=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
@@ -9022,7 +9283,9 @@ CONFIG_AD9523=m
 #
 CONFIG_ADF4350=m
 CONFIG_ADF4371=m
+# CONFIG_ADF4377 is not set
 CONFIG_ADMV1013=m
+CONFIG_ADMV4420=m
 CONFIG_ADRF6780=m
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
@@ -9091,6 +9354,8 @@ CONFIG_ADIS16480=m
 CONFIG_BMI160=m
 CONFIG_BMI160_I2C=m
 CONFIG_BMI160_SPI=m
+# CONFIG_BOSCH_BNO055_SERIAL is not set
+# CONFIG_BOSCH_BNO055_I2C is not set
 CONFIG_FXOS8700=m
 CONFIG_FXOS8700_I2C=m
 CONFIG_FXOS8700_SPI=m
@@ -9140,6 +9405,7 @@ CONFIG_HID_SENSOR_PROX=m
 CONFIG_JSA1212=m
 CONFIG_RPR0521=m
 CONFIG_LTR501=m
+# CONFIG_LTRF216A is not set
 CONFIG_LV0104CS=m
 CONFIG_MAX44000=m
 CONFIG_MAX44009=m
@@ -9189,6 +9455,7 @@ CONFIG_SENSORS_HMC5843_SPI=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# CONFIG_TI_TMAG5273 is not set
 CONFIG_YAMAHA_YAS530=m
 # end of Magnetometer sensors
 
@@ -9289,7 +9556,10 @@ CONFIG_MB1232=m
 CONFIG_PING=m
 CONFIG_RFD77402=m
 CONFIG_SRF04=m
+CONFIG_SX_COMMON=m
 CONFIG_SX9310=m
+CONFIG_SX9324=m
+CONFIG_SX9360=m
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 CONFIG_VCNL3020=m
@@ -9316,17 +9586,18 @@ CONFIG_TMP007=m
 CONFIG_TMP117=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+# CONFIG_MAX30208 is not set
 CONFIG_MAX31856=m
 CONFIG_MAX31865=m
 # end of Temperature sensors
 
 # CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_DEBUG is not set
 # CONFIG_PWM_ATMEL_TCB is not set
 CONFIG_PWM_BCM2835=m
+# CONFIG_PWM_CLK is not set
 CONFIG_PWM_CROS_EC=m
 # CONFIG_PWM_DWC is not set
 CONFIG_PWM_FSL_FTM=m
@@ -9346,6 +9617,7 @@ CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
+# CONFIG_PWM_XILINX is not set
 
 #
 # IRQ chip support
@@ -9358,6 +9630,9 @@ CONFIG_ARMADA_370_XP_IRQ=y
 # CONFIG_AL_FIC is not set
 CONFIG_BRCMSTB_L2_IRQ=y
 CONFIG_OMAP_IRQCHIP=y
+CONFIG_SUN4I_INTC=y
+CONFIG_SUN6I_R_INTC=y
+CONFIG_SUNXI_NMI_INTC=y
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_IRQ_CROSSBAR=y
@@ -9367,6 +9642,7 @@ CONFIG_LS_SCFG_MSI=y
 CONFIG_MESON_IRQ_GPIO=y
 CONFIG_IMX_IRQSTEER=y
 CONFIG_IMX_INTMUX=y
+CONFIG_IMX_MU_MSI=m
 CONFIG_TI_PRUSS_INTC=y
 CONFIG_EXYNOS_IRQ_COMBINER=y
 # end of IRQ chip support
@@ -9385,6 +9661,7 @@ CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_SOCFPGA=y
 CONFIG_RESET_SUNXI=y
 CONFIG_RESET_TI_SYSCON=y
+# CONFIG_RESET_TI_TPS380X is not set
 CONFIG_RESET_ZYNQ=y
 
 #
@@ -9400,6 +9677,7 @@ CONFIG_PHY_SUN9I_USB=y
 # CONFIG_PHY_MESON8_HDMI_TX is not set
 CONFIG_PHY_MESON8B_USB2=y
 CONFIG_PHY_MESON_GXL_USB2=y
+CONFIG_PHY_MESON_G12A_MIPI_DPHY_ANALOG=y
 CONFIG_PHY_MESON_G12A_USB2=y
 CONFIG_PHY_MESON_G12A_USB3_PCIE=y
 CONFIG_PHY_MESON_AXG_PCIE=y
@@ -9414,11 +9692,9 @@ CONFIG_PHY_MESON_AXG_MIPI_DPHY=y
 
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
+# CONFIG_PHY_CADENCE_DPHY_RX is not set
 # CONFIG_PHY_CADENCE_SIERRA is not set
 # CONFIG_PHY_CADENCE_SALVO is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_FSL_IMX8M_PCIE is not set
 CONFIG_ARMADA375_USBCLUSTER_PHY=y
 # CONFIG_PHY_MVEBU_A3700_COMPHY is not set
 # CONFIG_PHY_MVEBU_A3700_UTMI is not set
@@ -9440,7 +9716,9 @@ CONFIG_PHY_ROCKCHIP_EMMC=y
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 # CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY is not set
 # CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set
+# CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY is not set
 CONFIG_PHY_ROCKCHIP_PCIE=y
+# CONFIG_PHY_ROCKCHIP_SNPS_PCIE3 is not set
 CONFIG_PHY_ROCKCHIP_TYPEC=y
 CONFIG_PHY_ROCKCHIP_USB=y
 CONFIG_PHY_EXYNOS_DP_VIDEO=y
@@ -9475,6 +9753,7 @@ CONFIG_ARM_CCI400_PMU=y
 # CONFIG_ARM_CCN is not set
 CONFIG_ARM_PMU=y
 # CONFIG_FSL_IMX8_DDR_PMU is not set
+# CONFIG_MESON_DDR_PMU is not set
 # end of Performance monitor support
 
 CONFIG_RAS=y
@@ -9483,7 +9762,7 @@ CONFIG_RAS=y
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+# CONFIG_ANDROID_BINDER_IPC is not set
 # end of Android
 
 # CONFIG_DAX is not set
@@ -9491,13 +9770,14 @@ CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_IMX_IIM=y
 CONFIG_NVMEM_IMX_OCOTP=y
-CONFIG_ROCKCHIP_EFUSE=y
-# CONFIG_ROCKCHIP_OTP is not set
+CONFIG_NVMEM_MESON_MX_EFUSE=y
+CONFIG_NVMEM_RMEM=m
+CONFIG_NVMEM_ROCKCHIP_EFUSE=y
+# CONFIG_NVMEM_ROCKCHIP_OTP is not set
+CONFIG_NVMEM_SNVS_LPGPR=y
 CONFIG_NVMEM_SUNXI_SID=y
+# CONFIG_NVMEM_U_BOOT_ENV is not set
 CONFIG_NVMEM_VF610_OCOTP=y
-CONFIG_MESON_MX_EFUSE=y
-CONFIG_NVMEM_SNVS_LPGPR=y
-CONFIG_NVMEM_RMEM=m
 
 #
 # HW tracing support
@@ -9524,6 +9804,8 @@ CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_FPGA_REGION=m
 CONFIG_OF_FPGA_REGION=m
 # CONFIG_FPGA_DFL is not set
+# CONFIG_FPGA_MGR_MICROCHIP_SPI is not set
+# CONFIG_FPGA_MGR_LATTICE_SYSCONFIG_SPI is not set
 # CONFIG_FSI is not set
 # CONFIG_TEE is not set
 CONFIG_MULTIPLEXER=m
@@ -9544,12 +9826,13 @@ CONFIG_INTERCONNECT=y
 # CONFIG_INTERCONNECT_IMX is not set
 # CONFIG_INTERCONNECT_SAMSUNG is not set
 CONFIG_COUNTER=m
+# CONFIG_FTM_QUADDEC is not set
 CONFIG_INTERRUPT_CNT=m
+# CONFIG_TI_ECAP_CAPTURE is not set
 CONFIG_TI_EQEP=m
-# CONFIG_FTM_QUADDEC is not set
-# CONFIG_MICROCHIP_TCB_CAPTURE is not set
-# CONFIG_INTEL_QEP is not set
 # CONFIG_MOST is not set
+# CONFIG_PECI is not set
+# CONFIG_HTE is not set
 # end of Device Drivers
 
 #
@@ -9558,6 +9841,7 @@ CONFIG_TI_EQEP=m
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_VALIDATE_FS_PARSER=y
 CONFIG_FS_IOMAP=y
+CONFIG_LEGACY_DIRECT_IO=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
@@ -9607,6 +9891,7 @@ CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_F2FS_FS_COMPRESSION is not set
 CONFIG_F2FS_IOSTAT=y
+# CONFIG_F2FS_UNFAIR_RWSEM is not set
 # CONFIG_ZONEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
@@ -9615,7 +9900,6 @@ CONFIG_FILE_LOCKING=y
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FS_ENCRYPTION_ALGS=y
 CONFIG_FS_VERITY=y
-# CONFIG_FS_VERITY_DEBUG is not set
 # CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
@@ -9652,6 +9936,7 @@ CONFIG_FSCACHE_STATS=y
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_ERROR_INJECTION is not set
+# CONFIG_CACHEFILES_ONDEMAND is not set
 # end of Caches
 
 #
@@ -9740,8 +10025,10 @@ CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_FILE_CACHE=y
 # CONFIG_SQUASHFS_FILE_DIRECT is not set
 CONFIG_SQUASHFS_DECOMP_SINGLE=y
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
@@ -9788,10 +10075,9 @@ CONFIG_ROOT_NFS=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
-# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFS_V4_2_READ_PLUS=y
 CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V2 is not set
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_PNFS=y
@@ -9807,11 +10093,15 @@ CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y
+# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
+# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
@@ -9836,7 +10126,7 @@ CONFIG_SMBFS_COMMON=m
 # CONFIG_9P_FS is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
@@ -9884,8 +10174,9 @@ CONFIG_NLS_MAC_ICELAND=m
 CONFIG_NLS_MAC_INUIT=m
 CONFIG_NLS_MAC_ROMANIAN=m
 CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=y
+CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
+# CONFIG_DLM_DEPRECATED_API is not set
 # CONFIG_DLM_DEBUG is not set
 CONFIG_UNICODE=y
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
@@ -9909,7 +10200,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 # CONFIG_SECURITY_SELINUX is not set
@@ -9940,15 +10230,21 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
 #
 # Memory initialization
 #
+CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
+CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_INIT_STACK_ALL_PATTERN is not set
+# CONFIG_INIT_STACK_ALL_ZERO is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 # CONFIG_ZERO_CALL_USED_REGS is not set
 # end of Memory initialization
+
+CONFIG_RANDSTRUCT_NONE=y
+# CONFIG_RANDSTRUCT_FULL is not set
+# CONFIG_RANDSTRUCT_PERFORMANCE is not set
 # end of Kernel hardening options
 # end of Security options
 
@@ -9983,7 +10279,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
@@ -9992,101 +10287,112 @@ CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_ENGINE=y
+# end of Crypto core or helper
 
 #
 # Public-key cryptography
 #
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_DH=m
+# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
 CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
 # CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
+# end of Public-key cryptography
 
 #
-# Authenticated Encryption with Associated Data
+# Block ciphers
 #
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_AEGIS128=m
-# CONFIG_CRYPTO_AEGIS128_SIMD is not set
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_ANUBIS=m
+# CONFIG_CRYPTO_ARIA is not set
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+# CONFIG_CRYPTO_SM4_GENERIC is not set
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+# end of Block ciphers
 
 #
-# Block modes
+# Length-preserving ciphers and modes
 #
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
+# CONFIG_CRYPTO_HCTR2 is not set
+CONFIG_CRYPTO_KEYWRAP=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
 CONFIG_CRYPTO_NHPOLY1305=m
-CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_ESSIV=m
+# end of Length-preserving ciphers and modes
 
 #
-# Hash modes
+# AEAD (authenticated encryption with associated data) ciphers
 #
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_AEGIS128=m
+# CONFIG_CRYPTO_AEGIS128_SIMD is not set
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ESSIV=m
+# end of AEAD (authenticated encryption with associated data) ciphers
 
 #
-# Digest
+# Hashes, digests, and MACs
 #
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO_BLAKE2B=y
-# CONFIG_CRYPTO_BLAKE2S is not set
-CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
-# CONFIG_CRYPTO_SM3 is not set
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_SM3_GENERIC=m
 # CONFIG_CRYPTO_STREEBOG is not set
+CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_XXHASH=y
+# end of Hashes, digests, and MACs
 
 #
-# Ciphers
+# CRCs (cyclic redundancy checks)
 #
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32=y
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# end of CRCs (cyclic redundancy checks)
 
 #
 # Compression
@@ -10097,9 +10403,10 @@ CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=y
+# end of Compression
 
 #
-# Random Number Generation
+# Random number generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DRBG_MENU=y
@@ -10108,6 +10415,11 @@ CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+# end of Random number generation
+
+#
+# Userspace interface
+#
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -10116,7 +10428,33 @@ CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
+# end of Userspace interface
+
 CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Accelerated Cryptographic Algorithms for CPU (arm)
+#
+CONFIG_CRYPTO_CURVE25519_NEON=m
+# CONFIG_CRYPTO_GHASH_ARM_CE is not set
+CONFIG_CRYPTO_NHPOLY1305_NEON=m
+CONFIG_CRYPTO_POLY1305_ARM=m
+CONFIG_CRYPTO_BLAKE2S_ARM=y
+CONFIG_CRYPTO_BLAKE2B_NEON=m
+CONFIG_CRYPTO_SHA1_ARM=y
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+# CONFIG_CRYPTO_SHA1_ARM_CE is not set
+# CONFIG_CRYPTO_SHA2_ARM_CE is not set
+CONFIG_CRYPTO_SHA256_ARM=m
+CONFIG_CRYPTO_SHA512_ARM=m
+CONFIG_CRYPTO_AES_ARM=y
+CONFIG_CRYPTO_AES_ARM_BS=m
+# CONFIG_CRYPTO_AES_ARM_CE is not set
+CONFIG_CRYPTO_CHACHA20_NEON=m
+# CONFIG_CRYPTO_CRC32_ARM_CE is not set
+# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
+# end of Accelerated Cryptographic Algorithms for CPU (arm)
+
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -10144,6 +10482,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y
 CONFIG_CRYPTO_DEV_OMAP=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
@@ -10155,9 +10494,17 @@ CONFIG_CRYPTO_DEV_ATMEL_I2C=m
 CONFIG_CRYPTO_DEV_ATMEL_ECC=m
 CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
+# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
+# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
+# CONFIG_CRYPTO_DEV_QAT_C62X is not set
+# CONFIG_CRYPTO_DEV_QAT_4XXX is not set
+# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
+# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
+# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
 CONFIG_CRYPTO_DEV_MARVELL=m
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
+# CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG is not set
 # CONFIG_CRYPTO_DEV_CHELSIO is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
@@ -10171,6 +10518,7 @@ CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+# CONFIG_FIPS_SIGNATURE_SELFTEST is not set
 
 #
 # Certificates for signature checking
@@ -10206,8 +10554,10 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 #
 # Crypto library routines
 #
+CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_GF128MUL=m
 CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
 CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
@@ -10221,13 +10571,14 @@ CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
 CONFIG_CRYPTO_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_SM4=m
 # end of Crypto library routines
 
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
+CONFIG_CRC64_ROCKSOFT=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@@ -10235,7 +10586,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
+CONFIG_CRC64=y
 # CONFIG_CRC4 is not set
 CONFIG_CRC7=y
 CONFIG_LIBCRC32C=y
@@ -10250,6 +10601,7 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4HC_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMMON=y
 CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
@@ -10278,6 +10630,7 @@ CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_BTREE=y
+CONFIG_XARRAY_MULTI=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_DMA=y
@@ -10287,8 +10640,9 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
-CONFIG_DMA_REMAP=y
 CONFIG_DMA_CMA=y
 # CONFIG_DMA_PERNUMA_CMA is not set
 
@@ -10305,6 +10659,7 @@ CONFIG_CMA_ALIGNMENT=8
 # CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_CHECK_SIGNATURE=y
+# CONFIG_FORCE_NR_CPUS is not set
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
@@ -10338,6 +10693,7 @@ CONFIG_FONT_TER16x32=y
 # CONFIG_FONT_6x8 is not set
 CONFIG_SG_SPLIT=y
 CONFIG_SG_POOL=y
+CONFIG_ARCH_STACKWALK=y
 CONFIG_SBITMAP=y
 # end of Library routines
 
@@ -10363,10 +10719,17 @@ CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
 
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
 #
 # Compile-time checks and compiler options
 #
-# CONFIG_DEBUG_INFO is not set
+CONFIG_AS_HAS_NON_CONST_LEB128=y
+CONFIG_DEBUG_INFO_NONE=y
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
@@ -10397,32 +10760,32 @@ CONFIG_KGDB_KDB=y
 CONFIG_KDB_DEFAULT_ENABLE=0x1
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
 CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments
 
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
 #
 # Networking Debugging
 #
 # CONFIG_NET_DEV_REFCNT_TRACKER is not set
 # CONFIG_NET_NS_REFCNT_TRACKER is not set
+# CONFIG_DEBUG_NET is not set
 # end of Networking Debugging
 
 #
 # Memory Debugging
 #
 # CONFIG_PAGE_EXTENSION is not set
+# CONFIG_SLUB_DEBUG is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_WX is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SHRINKER_DEBUG is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 CONFIG_SCHED_STACK_END_CHECK=y
 # CONFIG_DEBUG_VM is not set
@@ -10433,6 +10796,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_KMAP_LOCAL is not set
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # CONFIG_KASAN is not set
@@ -10451,11 +10815,9 @@ CONFIG_PANIC_TIMEOUT=0
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_WQ_WATCHDOG=y
 # CONFIG_TEST_LOCKUP is not set
 # end of Debug Oops, Lockups and Hangs
@@ -10503,6 +10865,7 @@ CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# CONFIG_DEBUG_MAPLE_TREE is not set
 # end of Debug kernel data structures
 
 # CONFIG_DEBUG_CREDENTIALS is not set
@@ -10514,6 +10877,8 @@ CONFIG_STACKTRACE=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_REF_SCALE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
+# CONFIG_RCU_CPU_STALL_CPUTIME is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging
@@ -10521,6 +10886,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
+# CONFIG_DEBUG_CGROUP_REF is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -10558,6 +10924,7 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 #
 # CONFIG_KUNIT is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FUNCTION_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
@@ -10566,4 +10933,9 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_ARCH_USE_MEMTEST=y
 # CONFIG_MEMTEST is not set
 # end of Kernel Testing and Coverage
+
+#
+# Rust hacking
+#
+# end of Rust hacking
 # end of Kernel hacking
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index e371f4888..d6ff695e0 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.5-gnu Kernel Configuration
+# Linux/x86 6.3.3-gnu Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230429"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120200
+CONFIG_GCC_VERSION=130101
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23900
+CONFIG_AS_VERSION=24000
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23900
+CONFIG_LD_VERSION=24000
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=124
+CONFIG_PAHOLE_VERSION=125
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -73,7 +73,6 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_SIM=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_IRQ_MSI_IOMMU=y
 CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
 CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
@@ -172,9 +171,9 @@ CONFIG_RCU_NOCB_CPU=y
 # CONFIG_RCU_NOCB_CPU_DEFAULT_ALL is not set
 # CONFIG_RCU_NOCB_CPU_CB_BOOST is not set
 # CONFIG_TASKS_TRACE_RCU_READ_MB is not set
+CONFIG_RCU_LAZY=y
 # end of RCU Subsystem
 
-CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_IKHEADERS=m
@@ -193,7 +192,7 @@ CONFIG_UCLAMP_BUCKETS_COUNT=5
 
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_GCC12_NO_ARRAY_BOUNDS=y
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
@@ -206,6 +205,7 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 # CONFIG_RT_GROUP_SCHED is not set
+CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
@@ -242,11 +242,13 @@ CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_ZSTD=y
 CONFIG_BOOT_CONFIG=y
+# CONFIG_BOOT_CONFIG_FORCE is not set
 # CONFIG_BOOT_CONFIG_EMBED is not set
 CONFIG_INITRAMFS_PRESERVE_MTIME=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_LD_ORPHAN_WARN=y
+CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
 CONFIG_SYSCTL=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
@@ -275,6 +277,7 @@ CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
@@ -315,7 +318,6 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_NR_GPIO=512
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_32_SMP=y
@@ -467,6 +469,9 @@ CONFIG_CC_HAS_IBT=y
 CONFIG_X86_INTEL_TSX_MODE_AUTO=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
+CONFIG_EFI_HANDOVER_PROTOCOL=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_MAP=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
 CONFIG_HZ_300=y
@@ -492,6 +497,9 @@ CONFIG_MODIFY_LDT_SYSCALL=y
 
 CONFIG_CC_HAS_SLS=y
 CONFIG_CC_HAS_RETURN_THUNK=y
+CONFIG_CC_HAS_ENTRY_PADDING=y
+CONFIG_FUNCTION_PADDING_CFI=0
+CONFIG_FUNCTION_PADDING_BYTES=4
 CONFIG_SPECULATION_MITIGATIONS=y
 CONFIG_RETPOLINE=y
 CONFIG_RETHUNK=y
@@ -577,6 +585,7 @@ CONFIG_ACPI_WATCHDOG=y
 CONFIG_ACPI_EXTLOG=m
 CONFIG_ACPI_CONFIGFS=m
 CONFIG_ACPI_PCC=y
+CONFIG_ACPI_FFH=y
 CONFIG_PMIC_OPREGION=y
 CONFIG_BYTCRC_PMIC_OPREGION=y
 CONFIG_CHTCRC_PMIC_OPREGION=y
@@ -707,15 +716,18 @@ CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_NO_POLL=y
 CONFIG_KVM_XFER_TO_GUEST_WORK=y
 CONFIG_HAVE_KVM_PM_NOTIFIER=y
+CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
+CONFIG_KVM_SMM=y
 CONFIG_KVM_XEN=y
 CONFIG_AS_AVX512=y
 CONFIG_AS_SHA1_NI=y
 CONFIG_AS_SHA256_NI=y
 CONFIG_AS_TPAUSE=y
+CONFIG_AS_GFNI=y
 
 #
 # General architecture-dependent options
@@ -773,6 +785,7 @@ CONFIG_MMU_GATHER_TABLE_FREE=y
 CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
 CONFIG_MMU_GATHER_MERGE_VMAS=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
@@ -840,6 +853,8 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+CONFIG_FUNCTION_ALIGNMENT_4B=y
+CONFIG_FUNCTION_ALIGNMENT=4
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -865,6 +880,7 @@ CONFIG_MODULE_SIG_HASH="sha512"
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS_XZ is not set
 CONFIG_MODULE_COMPRESS_ZSTD=y
+CONFIG_MODULE_DECOMPRESS=y
 CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
@@ -984,6 +1000,7 @@ CONFIG_ZBUD=y
 CONFIG_Z3FOLD=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
+CONFIG_ZSMALLOC_CHAIN_SIZE=8
 
 #
 # SLAB allocator options
@@ -1224,6 +1241,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CONNTRACK_OVS=y
 CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_GRE=y
 CONFIG_NF_CT_PROTO_SCTP=y
@@ -1251,6 +1269,7 @@ CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NF_NAT_OVS=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y
@@ -1265,7 +1284,6 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
@@ -1477,7 +1495,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_RAW=m
@@ -1588,6 +1605,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 # CONFIG_BRIDGE_MRP is not set
 CONFIG_BRIDGE_CFM=y
 CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_NONE=m
 CONFIG_NET_DSA_TAG_AR9331=m
 CONFIG_NET_DSA_TAG_BRCM_COMMON=m
 CONFIG_NET_DSA_TAG_BRCM=m
@@ -1649,10 +1667,8 @@ CONFIG_NET_SCHED=y
 #
 # Queueing/Scheduling
 #
-CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_RED=m
@@ -1662,9 +1678,9 @@ CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_CBS=m
 CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_MQPRIO_LIB=m
 CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
@@ -1695,14 +1711,11 @@ CONFIG_DEFAULT_NET_SCH="fq_codel"
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
 CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
@@ -1844,6 +1857,7 @@ CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 # CONFIG_BT_HS is not set
 CONFIG_BT_LE=y
+CONFIG_BT_LE_L2CAP_ECRED=y
 CONFIG_BT_6LOWPAN=m
 CONFIG_BT_LEDS=y
 # CONFIG_BT_MSFTEXT is not set
@@ -1861,6 +1875,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_MTK=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_POLL_SYNC=y
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
@@ -1880,6 +1895,7 @@ CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBCM4377=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIDTL1=m
@@ -1898,8 +1914,10 @@ CONFIG_BT_VIRTIO=m
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_INJECT_RX_DELAY is not set
 CONFIG_AF_RXRPC_DEBUG=y
 CONFIG_RXKAD=y
+# CONFIG_RXPERF is not set
 CONFIG_AF_KCM=m
 CONFIG_STREAM_PARSER=y
 CONFIG_MCTP=y
@@ -2032,7 +2050,6 @@ CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_EDR=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
@@ -2175,7 +2192,6 @@ CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_SOUNDWIRE=m
 CONFIG_REGMAP_SOUNDWIRE_MBQ=m
 CONFIG_REGMAP_SCCB=m
-CONFIG_REGMAP_SPI_AVMM=m
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # end of Generic Driver Options
@@ -2214,9 +2230,10 @@ CONFIG_FW_CFG_SYSFS=m
 # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
 CONFIG_SYSFB=y
 # CONFIG_SYSFB_SIMPLEFB is not set
-CONFIG_CS_DSP=m
+CONFIG_FW_CS_DSP=m
 CONFIG_GOOGLE_FIRMWARE=y
 # CONFIG_GOOGLE_SMI is not set
+CONFIG_GOOGLE_CBMEM=m
 CONFIG_GOOGLE_COREBOOT_TABLE=m
 CONFIG_GOOGLE_MEMCONSOLE=m
 # CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
@@ -2229,11 +2246,8 @@ CONFIG_GOOGLE_VPD=m
 CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_EFI_RUNTIME_MAP=y
-# CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_BOOTLOADER_CONTROL=m
 CONFIG_EFI_CAPSULE_LOADER=y
 CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
@@ -2415,7 +2429,6 @@ CONFIG_PARPORT_SERIAL=m
 CONFIG_PARPORT_PC_FIFO=y
 CONFIG_PARPORT_PC_SUPERIO=y
 CONFIG_PARPORT_PC_PCMCIA=m
-CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_NOT_PC=y
 CONFIG_PNP=y
@@ -2432,7 +2445,6 @@ CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
 # CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
-# CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_ZRAM=m
 CONFIG_ZRAM_DEF_COMP_LZORLE=y
@@ -2444,6 +2456,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 CONFIG_ZRAM_WRITEBACK=y
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_ZRAM_MULTI_COMP=y
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
 CONFIG_BLK_DEV_DRBD=m
@@ -2498,6 +2511,8 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_SMPRO_ERRMON=m
+CONFIG_SMPRO_MISC=m
 CONFIG_CS5535_MFGPT=m
 CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
 CONFIG_CS5535_CLOCK_EVENT_SRC=m
@@ -2561,7 +2576,6 @@ CONFIG_BCM_VK_TTY=y
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
-CONFIG_HABANA_AI=m
 CONFIG_UACCE=m
 CONFIG_PVPANIC=y
 CONFIG_PVPANIC_MMIO=m
@@ -2827,6 +2841,7 @@ CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_QDI=m
 CONFIG_PATA_RZ1000=m
 CONFIG_PATA_WINBOND_VLB=m
+# CONFIG_PATA_PARPORT is not set
 
 #
 # Generic fallback / legacy drivers
@@ -3003,9 +3018,12 @@ CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_SPI=m
+# CONFIG_NET_DSA_MICROCHIP_KSZ_PTP is not set
 CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_MSCC_FELIX_DSA_LIB=m
+# CONFIG_NET_DSA_MSCC_OCELOT_EXT is not set
 CONFIG_NET_DSA_MSCC_SEVILLE=m
 CONFIG_NET_DSA_AR9331=m
 CONFIG_NET_DSA_QCA8K=m
@@ -3173,6 +3191,7 @@ CONFIG_ICE_HWTS=y
 CONFIG_FM10K=m
 CONFIG_IGC=m
 CONFIG_NET_VENDOR_WANGXUN=y
+CONFIG_LIBWX=m
 CONFIG_NGBE=m
 CONFIG_TXGBE=m
 CONFIG_JME=m
@@ -3233,6 +3252,7 @@ CONFIG_ENC28J60=m
 CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
 # CONFIG_LAN966X_SWITCH is not set
+CONFIG_VCAP=y
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 # CONFIG_MSCC_OCELOT_SWITCH is not set
@@ -3251,6 +3271,7 @@ CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NFP=m
 CONFIG_NFP_APP_FLOWER=y
 CONFIG_NFP_APP_ABM_NIC=y
+CONFIG_NFP_NET_IPSEC=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
@@ -3420,6 +3441,7 @@ CONFIG_MOTORCOMM_PHY=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_NXP_C45_TJA11XX_PHY=m
 CONFIG_NXP_TJA11XX_PHY=m
+# CONFIG_NCN26000_PHY is not set
 CONFIG_AT803X_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
@@ -3451,7 +3473,6 @@ CONFIG_CAN_CAN327=m
 CONFIG_CAN_JANZ_ICAN3=m
 CONFIG_CAN_KVASER_PCIEFD=m
 CONFIG_CAN_SLCAN=m
-CONFIG_PCH_CAN=m
 CONFIG_CAN_C_CAN=m
 CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CAN_C_CAN_PCI=m
@@ -3671,6 +3692,7 @@ CONFIG_ATH11K_DEBUG=y
 CONFIG_ATH11K_DEBUGFS=y
 # CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH11K_SPECTRAL=y
+# CONFIG_ATH12K is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
@@ -3822,6 +3844,7 @@ CONFIG_MT7921_COMMON=m
 CONFIG_MT7921E=m
 CONFIG_MT7921S=m
 # CONFIG_MT7921U is not set
+CONFIG_MT7996E=m
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 CONFIG_WILC1000=m
 CONFIG_WILC1000_SDIO=m
@@ -3885,21 +3908,29 @@ CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTW88=m
 CONFIG_RTW88_CORE=m
 CONFIG_RTW88_PCI=m
+CONFIG_RTW88_USB=m
 CONFIG_RTW88_8822B=m
 CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
 CONFIG_RTW88_8821C=m
 CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8822CU=m
 # CONFIG_RTW88_8723DE is not set
+CONFIG_RTW88_8723DU=m
 CONFIG_RTW88_8821CE=m
+CONFIG_RTW88_8821CU=m
 CONFIG_RTW88_DEBUG=y
 CONFIG_RTW88_DEBUGFS=y
 CONFIG_RTW89=m
 CONFIG_RTW89_CORE=m
 CONFIG_RTW89_PCI=m
 CONFIG_RTW89_8852A=m
+CONFIG_RTW89_8852B=m
 CONFIG_RTW89_8852C=m
 CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852BE=m
 CONFIG_RTW89_8852CE=m
 CONFIG_RTW89_DEBUG=y
 CONFIG_RTW89_DEBUGMSG=y
@@ -3925,7 +3956,6 @@ CONFIG_WL18XX=m
 CONFIG_WLCORE=m
 # CONFIG_WLCORE_SPI is not set
 CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
@@ -4157,6 +4187,7 @@ CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
 CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
 CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP5=m
 CONFIG_TOUCHSCREEN_DA9034=m
 CONFIG_TOUCHSCREEN_DA9052=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
@@ -4169,6 +4200,7 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_HIDEEP=m
 CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
+CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m
 CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_ILITEK=m
 CONFIG_TOUCHSCREEN_S6SY761=m
@@ -4194,7 +4226,6 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
 CONFIG_TOUCHSCREEN_WM831X=m
@@ -4245,6 +4276,7 @@ CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_TOUCHSCREEN_HIMAX_HX83112B=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_88PM860X_ONKEY=m
 CONFIG_INPUT_88PM80X_ONKEY=m
@@ -4364,6 +4396,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
 CONFIG_LDISC_AUTOLOAD=y
 
 #
@@ -4377,6 +4410,7 @@ CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_FINTEK=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCILIB=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_EXAR=m
 CONFIG_SERIAL_8250_CS=m
@@ -4390,10 +4424,12 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_BOCA is not set
 # CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
 # CONFIG_SERIAL_8250_HUB6 is not set
+# CONFIG_SERIAL_8250_PCI1XXXX is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_DWLIB=y
+# CONFIG_SERIAL_8250_DFL is not set
 CONFIG_SERIAL_8250_DW=m
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_LPSS=y
@@ -4430,7 +4466,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
-CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_SERIAL_FSL_LINFLEXUART=m
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
 CONFIG_SERIAL_MEN_Z135=m
@@ -4464,6 +4499,7 @@ CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_IPMB=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+CONFIG_SSIF_IPMI_BMC=m
 CONFIG_IPMB_DEVICE_INTERFACE=m
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -4523,8 +4559,6 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 # CONFIG_XILLYBUS_OF is not set
 CONFIG_XILLYUSB=m
-CONFIG_RANDOM_TRUST_CPU=y
-CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
@@ -4554,7 +4588,7 @@ CONFIG_I2C_MUX_MLXCPLD=m
 
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_ALGOPCA=m
 
 #
@@ -4677,11 +4711,13 @@ CONFIG_SPI_MICROCHIP_CORE=m
 CONFIG_SPI_MICROCHIP_CORE_QSPI=m
 # CONFIG_SPI_LANTIQ_SSC is not set
 CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PCI1XXXX=m
 CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=m
 # CONFIG_SPI_ROCKCHIP is not set
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SIFIVE=m
+# CONFIG_SPI_SN_F_OSPI is not set
 CONFIG_SPI_MXIC=m
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 CONFIG_SPI_XCOMM=m
@@ -4801,6 +4837,7 @@ CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_MAX730X=m
+CONFIG_GPIO_IDIO_16=m
 
 #
 # Memory mapped GPIO drivers
@@ -4879,7 +4916,6 @@ CONFIG_GPIO_TPS68470=m
 CONFIG_GPIO_TQMX86=m
 CONFIG_GPIO_TWL4030=m
 CONFIG_GPIO_TWL6040=m
-CONFIG_GPIO_UCB1400=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_WM8350=m
 CONFIG_GPIO_WM8994=m
@@ -4918,6 +4954,7 @@ CONFIG_GPIO_VIPERBOARD=m
 # Virtual GPIO drivers
 #
 # CONFIG_GPIO_AGGREGATOR is not set
+CONFIG_GPIO_LATCH=m
 CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_VIRTIO=m
 CONFIG_GPIO_SIM=m
@@ -4932,7 +4969,6 @@ CONFIG_W1_CON=y
 CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
 CONFIG_W1_MASTER_SGI=m
 # end of 1-wire Bus Masters
@@ -4977,7 +5013,6 @@ CONFIG_POWER_RESET_TPS65086=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
-CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_IP5XXX_POWER is not set
 CONFIG_MAX8925_POWER=m
@@ -5047,6 +5082,8 @@ CONFIG_BATTERY_GAUGE_LTC2941=m
 CONFIG_BATTERY_GOLDFISH=m
 CONFIG_BATTERY_RT5033=m
 CONFIG_CHARGER_RT9455=m
+# CONFIG_CHARGER_RT9467 is not set
+# CONFIG_CHARGER_RT9471 is not set
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_CROS_PCHG=m
 # CONFIG_CHARGER_UCS1002 is not set
@@ -5064,6 +5101,7 @@ CONFIG_HWMON_VID=m
 #
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_SMPRO=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
@@ -5149,6 +5187,7 @@ CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MAX31790=m
+# CONFIG_SENSORS_MC34VR500 is not set
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_MLXREG_FAN=m
 CONFIG_SENSORS_TC654=m
@@ -5184,6 +5223,9 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NZXT_KRAKEN2=m
 CONFIG_SENSORS_NZXT_SMART2=m
+CONFIG_SENSORS_OCC_P8_I2C=m
+CONFIG_SENSORS_OCC=m
+CONFIG_SENSORS_OXP=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
@@ -5219,12 +5261,14 @@ CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MP2888=m
 CONFIG_SENSORS_MP2975=m
 CONFIG_SENSORS_MP5023=m
+# CONFIG_SENSORS_MPQ7932 is not set
 CONFIG_SENSORS_PIM4328=m
 # CONFIG_SENSORS_PLI1209BC is not set
 CONFIG_SENSORS_PM6764TR=m
 CONFIG_SENSORS_PXE1610=m
 CONFIG_SENSORS_Q54SJ108A2=m
 CONFIG_SENSORS_STPDDC60=m
+# CONFIG_SENSORS_TDA38640 is not set
 CONFIG_SENSORS_TPS40422=m
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_TPS546D24=m
@@ -5292,7 +5336,6 @@ CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_WM831X=m
 CONFIG_SENSORS_WM8350=m
 CONFIG_SENSORS_XGENE=m
-CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
 
 #
 # ACPI drivers
@@ -5307,6 +5350,7 @@ CONFIG_THERMAL_NETLINK=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
+CONFIG_THERMAL_ACPI=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
@@ -5328,6 +5372,7 @@ CONFIG_DEVFREQ_THERMAL=y
 #
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_INTEL_TCC=y
 CONFIG_X86_PKG_TEMP_THERMAL=m
 CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
@@ -5388,6 +5433,7 @@ CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
+CONFIG_ADVANTECH_EC_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_EBC_C384_WDT=m
@@ -5480,6 +5526,7 @@ CONFIG_MFD_CORE=y
 CONFIG_MFD_CS5535=m
 # CONFIG_MFD_ACT8945A is not set
 CONFIG_MFD_AS3711=y
+CONFIG_MFD_SMPRO=m
 # CONFIG_MFD_AS3722 is not set
 CONFIG_PMIC_ADP5520=y
 CONFIG_MFD_AAT2870_CORE=y
@@ -5513,8 +5560,6 @@ CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_MC13XXX_I2C=m
 # CONFIG_MFD_MP2629 is not set
 # CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_HTC_PASIC3=m
-CONFIG_HTC_I2CPLD=y
 CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
@@ -5555,7 +5600,6 @@ CONFIG_MFD_RETU=m
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
 CONFIG_MFD_SY7636A=m
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_RT4831=m
@@ -5586,6 +5630,7 @@ CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TI_LP873X=m
 # CONFIG_MFD_TI_LP87565 is not set
 # CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS65219 is not set
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
 CONFIG_MFD_TPS65912=m
@@ -5626,7 +5671,8 @@ CONFIG_MFD_ATC260X=m
 CONFIG_MFD_ATC260X_I2C=m
 # CONFIG_MFD_QCOM_PM8008 is not set
 CONFIG_RAVE_SP_CORE=m
-CONFIG_MFD_INTEL_M10_BMC=m
+# CONFIG_MFD_INTEL_M10_BMC_SPI is not set
+# CONFIG_MFD_INTEL_M10_BMC_PMCI is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # CONFIG_MFD_RSMU_SPI is not set
 # end of Multifunction device drivers
@@ -5684,6 +5730,7 @@ CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_MAX8997=m
 CONFIG_REGULATOR_MAX8998=m
 CONFIG_REGULATOR_MAX20086=m
+# CONFIG_REGULATOR_MAX20411 is not set
 CONFIG_REGULATOR_MAX77693=m
 # CONFIG_REGULATOR_MAX77826 is not set
 CONFIG_REGULATOR_MC13XXX_CORE=m
@@ -5698,6 +5745,7 @@ CONFIG_REGULATOR_MT6311=m
 CONFIG_REGULATOR_MT6323=m
 CONFIG_REGULATOR_MT6331=m
 CONFIG_REGULATOR_MT6332=m
+CONFIG_REGULATOR_MT6357=m
 # CONFIG_REGULATOR_MT6358 is not set
 CONFIG_REGULATOR_MT6359=m
 CONFIG_REGULATOR_MT6370=m
@@ -5721,6 +5769,7 @@ CONFIG_REGULATOR_RT5120=m
 # CONFIG_REGULATOR_RT5190A is not set
 CONFIG_REGULATOR_RT5759=m
 CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6190=m
 CONFIG_REGULATOR_RT6245=m
 CONFIG_REGULATOR_RTQ2134=m
 CONFIG_REGULATOR_RTMV20=m
@@ -6043,6 +6092,9 @@ CONFIG_VIDEO_DT3155=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_IVTV_ALSA=m
 # CONFIG_VIDEO_FB_IVTV is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_MXB is not set
 
 #
 # Media capture/analog/hybrid TV support
@@ -6086,6 +6138,7 @@ CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_PT1=m
 CONFIG_DVB_PT3=m
 CONFIG_DVB_SMIPCIE=m
+# CONFIG_DVB_BUDGET_CORE is not set
 CONFIG_VIDEO_IPU3_CIO2=m
 CONFIG_CIO2_BRIDGE=y
 CONFIG_RADIO_ADAPTERS=m
@@ -6134,7 +6187,6 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 #
 # Aspeed media platform drivers
 #
-CONFIG_VIDEO_ASPEED=m
 
 #
 # Atmel media platform drivers
@@ -6164,6 +6216,10 @@ CONFIG_VIDEO_CAFE_CCIC=m
 #
 
 #
+# Microchip Technology, Inc. media platform drivers
+#
+
+#
 # NVidia media platform drivers
 #
 
@@ -6224,6 +6280,8 @@ CONFIG_VIDEO_VIMC=m
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
+CONFIG_VIDEO_VISL=m
+# CONFIG_VISL_DEBUGFS is not set
 CONFIG_DVB_TEST_DRIVERS=y
 CONFIG_DVB_VIDTV=m
 
@@ -6239,6 +6297,7 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 #
 CONFIG_CYPRESS_FIRMWARE=m
 CONFIG_TTPCI_EEPROM=m
+CONFIG_UVC_COMMON=m
 CONFIG_VIDEO_CX2341X=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_DVB_B2C2_FLEXCOP=m
@@ -6282,11 +6341,13 @@ CONFIG_VIDEO_IMX219=m
 CONFIG_VIDEO_IMX258=m
 CONFIG_VIDEO_IMX274=m
 CONFIG_VIDEO_IMX290=m
+# CONFIG_VIDEO_IMX296 is not set
 CONFIG_VIDEO_IMX319=m
 # CONFIG_VIDEO_IMX334 is not set
 # CONFIG_VIDEO_IMX335 is not set
 CONFIG_VIDEO_IMX355=m
 # CONFIG_VIDEO_IMX412 is not set
+# CONFIG_VIDEO_IMX415 is not set
 CONFIG_VIDEO_MAX9271_LIB=m
 CONFIG_VIDEO_MT9M001=m
 CONFIG_VIDEO_MT9M032=m
@@ -6301,6 +6362,7 @@ CONFIG_VIDEO_NOON010PC30=m
 # CONFIG_VIDEO_OG01A1B is not set
 CONFIG_VIDEO_OV02A10=m
 # CONFIG_VIDEO_OV08D10 is not set
+CONFIG_VIDEO_OV08X40=m
 CONFIG_VIDEO_OV13858=m
 CONFIG_VIDEO_OV13B10=m
 CONFIG_VIDEO_OV2640=m
@@ -6308,6 +6370,7 @@ CONFIG_VIDEO_OV2659=m
 CONFIG_VIDEO_OV2680=m
 CONFIG_VIDEO_OV2685=m
 # CONFIG_VIDEO_OV2740 is not set
+CONFIG_VIDEO_OV4689=m
 # CONFIG_VIDEO_OV5640 is not set
 # CONFIG_VIDEO_OV5645 is not set
 CONFIG_VIDEO_OV5647=m
@@ -6323,6 +6386,7 @@ CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_OV772X=m
 CONFIG_VIDEO_OV7740=m
 CONFIG_VIDEO_OV8856=m
+# CONFIG_VIDEO_OV8858 is not set
 CONFIG_VIDEO_OV8865=m
 # CONFIG_VIDEO_OV9282 is not set
 CONFIG_VIDEO_OV9640=m
@@ -6332,11 +6396,11 @@ CONFIG_VIDEO_RDACM20=m
 CONFIG_VIDEO_RDACM21=m
 CONFIG_VIDEO_RJ54N1=m
 CONFIG_VIDEO_S5C73M3=m
-CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
 CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_SR030PC30=m
+# CONFIG_VIDEO_ST_VGXY61 is not set
 CONFIG_VIDEO_VS6624=m
 CONFIG_VIDEO_CCS=m
 CONFIG_VIDEO_ET8EK8=m
@@ -6609,6 +6673,7 @@ CONFIG_DVB_DUMMY_FE=m
 # Graphics support
 #
 CONFIG_APERTURE_HELPERS=y
+CONFIG_VIDEO_NOMODESET=y
 CONFIG_AGP=y
 CONFIG_AGP_ALI=m
 CONFIG_AGP_ATI=m
@@ -6626,7 +6691,6 @@ CONFIG_DRM=y
 CONFIG_DRM_MIPI_DBI=m
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
-CONFIG_DRM_USE_DYNAMIC_DEBUG=y
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
@@ -6684,7 +6748,6 @@ CONFIG_DRM_AMD_SECURE_DISPLAY=y
 # end of Display Engine Configuration
 
 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
@@ -6701,21 +6764,18 @@ CONFIG_DRM_I915_FENCE_TIMEOUT=10000
 CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
 CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
 CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
+CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE=7500
 CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
 CONFIG_DRM_I915_STOP_TIMEOUT=100
 CONFIG_DRM_I915_TIMESLICE_DURATION=1
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX_MKSSTATS=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_USE_LVDS is not set
-# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
 CONFIG_DRM_QXL=m
 CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_PANEL=y
@@ -6726,6 +6786,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
+# CONFIG_DRM_PANEL_AUO_A030JTN01 is not set
 # CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
@@ -6737,11 +6798,13 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
+# CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
+# CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
@@ -6752,6 +6815,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
+# CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set
@@ -6760,6 +6824,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
+# CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set
 # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
 # CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
 # CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
@@ -6793,6 +6858,7 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
+# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
 CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 # end of Display Panels
@@ -6803,7 +6869,6 @@ CONFIG_DRM_PANEL_BRIDGE=y
 #
 # Display Interface Bridges
 #
-# CONFIG_DRM_CDNS_DSI is not set
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_CROS_EC_ANX7688 is not set
@@ -6840,13 +6905,12 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_ANALOGIX_DP=m
 # CONFIG_DRM_ANALOGIX_ANX7625 is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
+# CONFIG_DRM_CDNS_DSI is not set
 # CONFIG_DRM_CDNS_MHDP8546 is not set
 # end of Display Interface Bridges
 
 # CONFIG_DRM_ETNAVIV is not set
 # CONFIG_DRM_LOGICVC is not set
-# CONFIG_DRM_MXSFB is not set
-# CONFIG_DRM_IMX_LCDIF is not set
 # CONFIG_DRM_ARCPGU is not set
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CIRRUS_QEMU=m
@@ -6867,14 +6931,7 @@ CONFIG_DRM_GUD=m
 # CONFIG_DRM_SSD130X is not set
 CONFIG_DRM_HYPERV=m
 CONFIG_DRM_LEGACY=y
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-CONFIG_DRM_NOMODESET=y
 CONFIG_DRM_PRIVACY_SCREEN=y
 
 #
@@ -7010,6 +7067,7 @@ CONFIG_LCD_HX8357=m
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_KTD253=m
+# CONFIG_BACKLIGHT_KTZ8866 is not set
 CONFIG_BACKLIGHT_LM3533=m
 # CONFIG_BACKLIGHT_CARILLO_RANCH is not set
 # CONFIG_BACKLIGHT_PWM is not set
@@ -7064,6 +7122,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 # CONFIG_LOGO is not set
 # end of Graphics support
 
+CONFIG_DRM_ACCEL=y
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -7276,6 +7335,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
 CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
+# CONFIG_SND_HDA_CTL_DEV_ID is not set
 # end of HD-Audio
 
 CONFIG_SND_HDA_CORE=m
@@ -7547,6 +7607,7 @@ CONFIG_SND_SOC_AK5386=m
 CONFIG_SND_SOC_AK5558=m
 CONFIG_SND_SOC_ALC5623=m
 # CONFIG_SND_SOC_AW8738 is not set
+# CONFIG_SND_SOC_AW88395 is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CROS_EC_CODEC=m
@@ -7559,12 +7620,12 @@ CONFIG_SND_SOC_CS35L41_LIB=m
 CONFIG_SND_SOC_CS35L41=m
 CONFIG_SND_SOC_CS35L41_SPI=m
 CONFIG_SND_SOC_CS35L41_I2C=m
-CONFIG_SND_SOC_CS35L45_TABLES=m
 CONFIG_SND_SOC_CS35L45=m
 CONFIG_SND_SOC_CS35L45_SPI=m
 CONFIG_SND_SOC_CS35L45_I2C=m
 CONFIG_SND_SOC_CS42L42_CORE=m
 CONFIG_SND_SOC_CS42L42=m
+# CONFIG_SND_SOC_CS42L42_SDW is not set
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS42L51_I2C=m
 CONFIG_SND_SOC_CS42L52=m
@@ -7600,6 +7661,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDA=m
 CONFIG_SND_SOC_ICS43432=m
+# CONFIG_SND_SOC_IDT821034 is not set
 CONFIG_SND_SOC_INNO_RK3036=m
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98090=m
@@ -7634,6 +7696,7 @@ CONFIG_SND_SOC_PCM5102A=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 CONFIG_SND_SOC_PCM512x_SPI=m
+# CONFIG_SND_SOC_PEB2466 is not set
 CONFIG_SND_SOC_RK3328=m
 CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RL6347A=m
@@ -7646,6 +7709,7 @@ CONFIG_SND_SOC_RT1019=m
 CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
+CONFIG_SND_SOC_RT1318_SDW=m
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5514_SPI=m
 CONFIG_SND_SOC_RT5616=m
@@ -7668,6 +7732,7 @@ CONFIG_SND_SOC_RT700_SDW=m
 CONFIG_SND_SOC_RT711=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT711_SDCA_SDW=m
+# CONFIG_SND_SOC_RT712_SDCA_SDW is not set
 CONFIG_SND_SOC_RT715=m
 CONFIG_SND_SOC_RT715_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
@@ -7680,6 +7745,7 @@ CONFIG_SND_SOC_SIGMADSP_I2C=m
 CONFIG_SND_SOC_SIGMADSP_REGMAP=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SIMPLE_MUX=m
+# CONFIG_SND_SOC_SMA1303 is not set
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SRC4XXX_I2C=m
 CONFIG_SND_SOC_SRC4XXX=m
@@ -7750,6 +7816,7 @@ CONFIG_SND_SOC_WM8903=m
 CONFIG_SND_SOC_WM8904=m
 CONFIG_SND_SOC_WM8940=m
 CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8961=m
 CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8974=m
 CONFIG_SND_SOC_WM8978=m
@@ -7786,10 +7853,7 @@ CONFIG_HDMI_LPE_AUDIO=m
 CONFIG_SND_SYNTH_EMUX=m
 CONFIG_SND_VIRTIO=m
 CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
@@ -7826,6 +7890,7 @@ CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
+# CONFIG_HID_EVISION is not set
 CONFIG_HID_EZKEY=m
 CONFIG_HID_FT260=m
 CONFIG_HID_GEMBIRD=m
@@ -7929,6 +7994,12 @@ CONFIG_HID_MCP2221=m
 # end of Special HID drivers
 
 #
+# HID-BPF support
+#
+# CONFIG_HID_BPF is not set
+# end of HID-BPF support
+
+#
 # USB HID support
 #
 CONFIG_USB_HID=m
@@ -7936,15 +8007,11 @@ CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
 # end of USB HID support
 
-#
-# I2C HID support
-#
+CONFIG_I2C_HID=y
 CONFIG_I2C_HID_ACPI=m
 # CONFIG_I2C_HID_OF is not set
 # CONFIG_I2C_HID_OF_ELAN is not set
 # CONFIG_I2C_HID_OF_GOODIX is not set
-# end of I2C HID support
-
 CONFIG_I2C_HID_CORE=m
 
 #
@@ -7955,8 +8022,6 @@ CONFIG_SURFACE_KBD=m
 # end of Surface System Aggregator Module HID support
 
 CONFIG_SURFACE_HID_CORE=m
-# end of HID support
-
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -7997,7 +8062,6 @@ CONFIG_USB_EHCI_FSL=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_FOTG210_HCD=m
 CONFIG_USB_MAX3421_HCD=m
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PCI=y
@@ -8057,6 +8121,10 @@ CONFIG_USBIP_VHCI_NR_HCS=1
 CONFIG_USBIP_HOST=m
 CONFIG_USBIP_VUDC=m
 # CONFIG_USBIP_DEBUG is not set
+
+#
+# USB dual-mode controller drivers
+#
 CONFIG_USB_CDNS_SUPPORT=m
 CONFIG_USB_CDNS_HOST=y
 CONFIG_USB_CDNS3=m
@@ -8238,7 +8306,6 @@ CONFIG_U_SERIAL_CONSOLE=y
 # USB Peripheral Controller
 #
 # CONFIG_USB_FUSB300 is not set
-CONFIG_USB_FOTG210_UDC=m
 CONFIG_USB_GR_UDC=m
 CONFIG_USB_R8A66597=m
 CONFIG_USB_PXA27X=m
@@ -8361,6 +8428,7 @@ CONFIG_TYPEC_STUSB160X=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 CONFIG_TYPEC_MUX_FSA4480=m
+# CONFIG_TYPEC_MUX_GPIO_SBU is not set
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
@@ -8635,7 +8703,6 @@ CONFIG_EDAC_I5400=m
 CONFIG_EDAC_I7CORE=m
 CONFIG_EDAC_I82860=m
 CONFIG_EDAC_R82600=m
-CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I7300=m
 CONFIG_RTC_LIB=y
@@ -8761,7 +8828,6 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MSM6242=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_WM831X=m
 CONFIG_RTC_DRV_WM8350=m
 CONFIG_RTC_DRV_PCF50633=m
@@ -8800,6 +8866,7 @@ CONFIG_ALTERA_MSGDMA=m
 CONFIG_INTEL_IDMA64=m
 CONFIG_PCH_DMA=m
 CONFIG_PLX_DMA=m
+# CONFIG_XILINX_XDMA is not set
 # CONFIG_XILINX_ZYNQMP_DPDMA is not set
 CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QCOM_HIDMA=m
@@ -8848,9 +8915,10 @@ CONFIG_UIO_MF624=m
 CONFIG_UIO_HV_GENERIC=m
 CONFIG_UIO_DFL=m
 CONFIG_VFIO=m
+CONFIG_VFIO_CONTAINER=y
 CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
 # CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_VIRQFD=y
 CONFIG_VFIO_PCI_CORE=m
 CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
@@ -8858,7 +8926,6 @@ CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_VGA=y
 CONFIG_VFIO_PCI_IGD=y
 # CONFIG_MLX5_VFIO_PCI is not set
-CONFIG_VFIO_MDEV=m
 CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VMGENID=y
@@ -8885,8 +8952,10 @@ CONFIG_VDPA_USER=m
 CONFIG_IFCVF=m
 CONFIG_MLX5_VDPA=y
 CONFIG_MLX5_VDPA_NET=m
+# CONFIG_MLX5_VDPA_STEERING_DEBUG is not set
 CONFIG_VP_VDPA=m
 CONFIG_ALIBABA_ENI_VDPA=m
+# CONFIG_SNET_VDPA is not set
 CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST_RING=m
 CONFIG_VHOST=m
@@ -8918,7 +8987,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
-CONFIG_R8188EU=m
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -8979,6 +9047,7 @@ CONFIG_AD2S1210=m
 # CONFIG_FB_SM750 is not set
 CONFIG_STAGING_MEDIA=y
 # CONFIG_INTEL_ATOMISP is not set
+# CONFIG_DVB_AV7110 is not set
 CONFIG_VIDEO_IPU3_IMGU=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_STAGING_MEDIA_DEPRECATED is not set
@@ -9006,6 +9075,7 @@ CONFIG_CROS_EC=m
 CONFIG_CROS_EC_I2C=m
 # CONFIG_CROS_EC_RPMSG is not set
 CONFIG_CROS_EC_SPI=m
+# CONFIG_CROS_EC_UART is not set
 CONFIG_CROS_EC_LPC=m
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
@@ -9016,6 +9086,7 @@ CONFIG_CROS_EC_DEBUGFS=m
 CONFIG_CROS_EC_SENSORHUB=m
 CONFIG_CROS_EC_SYSFS=m
 CONFIG_CROS_EC_TYPEC=m
+CONFIG_CROS_HPS_I2C=m
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CROS_USBPD_NOTIFY=m
 # CONFIG_CHROMEOS_PRIVACY_SCREEN is not set
@@ -9085,16 +9156,18 @@ CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_PRIVACY=y
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_DESCRIPTOR=m
+CONFIG_DELL_WMI_DDV=m
 CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_WMI_SYSMAN=m
 CONFIG_AMILO_RFKILL=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
 CONFIG_HP_ACCEL=m
-CONFIG_WIRELESS_HOTKEY=m
 CONFIG_HP_WMI=m
 CONFIG_TC1100_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_SENSORS_HDAPS=m
@@ -9194,7 +9267,6 @@ CONFIG_CLKSRC_I8253=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
-# CONFIG_MICROCHIP_PIT64B is not set
 # end of Clock Source drivers
 
 CONFIG_MAILBOX=y
@@ -9223,6 +9295,8 @@ CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y
+CONFIG_INTEL_IOMMU_PERF_EVENTS=y
+CONFIG_IOMMUFD=m
 CONFIG_HYPERV_IOMMU=y
 CONFIG_VIRTIO_IOMMU=m
 
@@ -9290,9 +9364,12 @@ CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 # end of Enable LiteX SoC Builder specific drivers
 
+# CONFIG_WPCM450_SOC is not set
+
 #
 # Qualcomm SoC drivers
 #
+# CONFIG_QCOM_PMIC_GLINK is not set
 CONFIG_QCOM_QMI_HELPERS=m
 # end of Qualcomm SoC drivers
 
@@ -9397,6 +9474,9 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_IIO_KX022A=m
+CONFIG_IIO_KX022A_SPI=m
+CONFIG_IIO_KX022A_I2C=m
 CONFIG_KXSD9=m
 CONFIG_KXSD9_SPI=m
 CONFIG_KXSD9_I2C=m
@@ -9423,6 +9503,7 @@ CONFIG_STK8BA50=m
 # Analog to digital converters
 #
 CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD4130=m
 CONFIG_AD7091R5=m
 CONFIG_AD7124=m
 CONFIG_AD7192=m
@@ -9463,12 +9544,14 @@ CONFIG_MAX1027=m
 CONFIG_MAX11100=m
 CONFIG_MAX1118=m
 CONFIG_MAX11205=m
+CONFIG_MAX11410=m
 # CONFIG_MAX1241 is not set
 CONFIG_MAX1363=m
 CONFIG_MAX9611=m
 CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 CONFIG_MCP3911=m
+CONFIG_MEDIATEK_MT6370_ADC=m
 CONFIG_MEN_Z188_ADC=m
 CONFIG_NAU7802=m
 CONFIG_PALMAS_GPADC=m
@@ -9482,12 +9565,14 @@ CONFIG_TI_ADC108S102=m
 CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
+# CONFIG_TI_ADS7924 is not set
 CONFIG_TI_ADS7950=m
 CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_ADS124S08=m
 CONFIG_TI_ADS131E08=m
 CONFIG_TI_AM335X_ADC=m
+# CONFIG_TI_LMP92064 is not set
 CONFIG_TI_TLC4541=m
 CONFIG_TI_TSC2046=m
 CONFIG_TWL4030_MADC=m
@@ -9500,6 +9585,7 @@ CONFIG_XILINX_XADC=m
 #
 # Analog to digital and digital to analog converters
 #
+CONFIG_AD74115=m
 CONFIG_AD74413R=m
 # end of Analog to digital and digital to analog converters
 
@@ -9611,6 +9697,7 @@ CONFIG_LTC1660=m
 CONFIG_LTC2632=m
 CONFIG_M62332=m
 CONFIG_MAX517=m
+# CONFIG_MAX5522 is not set
 CONFIG_MAX5821=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
@@ -9647,6 +9734,7 @@ CONFIG_AD9523=m
 #
 CONFIG_ADF4350=m
 CONFIG_ADF4371=m
+CONFIG_ADF4377=m
 CONFIG_ADMV1013=m
 # CONFIG_ADMV4420 is not set
 CONFIG_ADRF6780=m
@@ -9822,6 +9910,7 @@ CONFIG_SENSORS_HMC5843_SPI=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+# CONFIG_TI_TMAG5273 is not set
 CONFIG_YAMAHA_YAS530=m
 # end of Magnetometer sensors
 
@@ -9953,6 +10042,7 @@ CONFIG_TMP007=m
 CONFIG_TMP117=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX30208=m
 CONFIG_MAX31856=m
 CONFIG_MAX31865=m
 # end of Temperature sensors
@@ -10113,8 +10203,9 @@ CONFIG_FPGA_DFL_FME_REGION=m
 CONFIG_FPGA_DFL_AFU=m
 CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000=m
 CONFIG_FPGA_DFL_PCI=m
-CONFIG_FPGA_M10_BMC_SEC_UPDATE=m
 CONFIG_FPGA_MGR_MICROCHIP_SPI=m
+CONFIG_FPGA_MGR_LATTICE_SYSCONFIG=m
+CONFIG_FPGA_MGR_LATTICE_SYSCONFIG_SPI=m
 # CONFIG_FSI is not set
 CONFIG_TEE=m
 CONFIG_MULTIPLEXER=m
@@ -10135,10 +10226,8 @@ CONFIG_SLIMBUS=m
 CONFIG_SLIM_QCOM_CTRL=m
 # CONFIG_INTERCONNECT is not set
 CONFIG_COUNTER=m
-CONFIG_INTERRUPT_CNT=m
-# CONFIG_FTM_QUADDEC is not set
-# CONFIG_MICROCHIP_TCB_CAPTURE is not set
 CONFIG_INTEL_QEP=m
+CONFIG_INTERRUPT_CNT=m
 CONFIG_MOST=m
 CONFIG_MOST_USB_HDM=m
 CONFIG_MOST_CDEV=m
@@ -10153,6 +10242,7 @@ CONFIG_HTE=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_VALIDATE_FS_PARSER=y
 CONFIG_FS_IOMAP=y
+CONFIG_LEGACY_DIRECT_IO=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=m
@@ -10222,7 +10312,6 @@ CONFIG_FILE_LOCKING=y
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FS_ENCRYPTION_ALGS=m
 CONFIG_FS_VERITY=y
-# CONFIG_FS_VERITY_DEBUG is not set
 CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
@@ -10350,9 +10439,11 @@ CONFIG_CRAMFS_MTD=y
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_DECOMP_MULTI=y
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT=y
+CONFIG_SQUASHFS_MOUNT_DECOMP_THREADS=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
@@ -10409,6 +10500,7 @@ CONFIG_EROFS_FS_SECURITY=y
 CONFIG_EROFS_FS_ZIP=y
 CONFIG_EROFS_FS_ZIP_LZMA=y
 CONFIG_EROFS_FS_ONDEMAND=y
+# CONFIG_EROFS_FS_PCPU_KTHREAD is not set
 CONFIG_VBOXSF_FS=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
@@ -10432,7 +10524,7 @@ CONFIG_NFS_DEBUG=y
 # CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
 # CONFIG_NFS_V4_2_READ_PLUS is not set
 CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
+# CONFIG_NFSD_V2 is not set
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_PNFS=y
@@ -10452,7 +10544,11 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y
+# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
+# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
@@ -10682,7 +10778,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
@@ -10926,6 +11021,7 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_GF128MUL=m
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
 CONFIG_CRYPTO_LIB_CHACHA=m
@@ -10999,6 +11095,7 @@ CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_BTREE=y
 CONFIG_INTERVAL_TREE=y
+CONFIG_INTERVAL_TREE_SPAN_ITER=y
 CONFIG_XARRAY_MULTI=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
@@ -11024,7 +11121,6 @@ CONFIG_CMA_ALIGNMENT=8
 # CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_CHECK_SIGNATURE=y
-# CONFIG_FORCE_NR_CPUS is not set
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
@@ -11058,6 +11154,7 @@ CONFIG_FONT_8x16=y
 CONFIG_FONT_TER16x32=y
 # CONFIG_FONT_6x8 is not set
 CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
 CONFIG_SBITMAP=y
@@ -11102,10 +11199,13 @@ CONFIG_AS_HAS_NON_CONST_LEB128=y
 CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_INFO_COMPRESSED is not set
+CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
+# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
+# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
 CONFIG_DEBUG_INFO_BTF_MODULES=y
 # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set
 # CONFIG_GDB_SCRIPTS is not set
@@ -11161,10 +11261,10 @@ CONFIG_DEBUG_WX=y
 CONFIG_GENERIC_PTDUMP=y
 CONFIG_PTDUMP_CORE=y
 # CONFIG_PTDUMP_DEBUGFS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-CONFIG_SHRINKER_DEBUG=y
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_OBJECTS is not set
+CONFIG_SHRINKER_DEBUG=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 CONFIG_SCHED_STACK_END_CHECK=y
 CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
@@ -11241,6 +11341,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_SCF_TORTURE_TEST is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)
 
+# CONFIG_NMI_CHECK_CPU is not set
 # CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
@@ -11267,6 +11368,7 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_RCU_REF_SCALE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
+# CONFIG_RCU_CPU_STALL_CPUTIME is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging
@@ -11274,6 +11376,7 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 CONFIG_LATENCYTOP=y
+# CONFIG_DEBUG_CGROUP_REF is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_RETHOOK=y
@@ -11388,6 +11491,7 @@ CONFIG_FUNCTION_ERROR_INJECTION=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_TEST_DHRY is not set
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_MIN_HEAP is not set
 # CONFIG_TEST_DIV64 is not set
@@ -11402,7 +11506,6 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_STRING_SELFTEST 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_SCANF is not set
@@ -11411,7 +11514,6 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_XARRAY is not set
 # CONFIG_TEST_MAPLE_TREE is not set
 # CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_PARMAN is not set
 # CONFIG_TEST_LKM is not set
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index abe5aeec0..e6d0fc4bd 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.5-gnu Kernel Configuration
+# Linux/x86 6.3.3-gnu Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230429"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120200
+CONFIG_GCC_VERSION=130101
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23900
+CONFIG_AS_VERSION=24000
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23900
+CONFIG_LD_VERSION=24000
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=124
+CONFIG_PAHOLE_VERSION=125
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -74,7 +74,6 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_SIM=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_IRQ_MSI_IOMMU=y
 CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
 CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
@@ -183,9 +182,9 @@ CONFIG_RCU_NOCB_CPU=y
 # CONFIG_RCU_NOCB_CPU_DEFAULT_ALL is not set
 # CONFIG_RCU_NOCB_CPU_CB_BOOST is not set
 # CONFIG_TASKS_TRACE_RCU_READ_MB is not set
+CONFIG_RCU_LAZY=y
 # end of RCU Subsystem
 
-CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_IKHEADERS=m
@@ -206,7 +205,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_GCC12_NO_ARRAY_BOUNDS=y
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
@@ -222,6 +221,7 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 # CONFIG_RT_GROUP_SCHED is not set
+CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
@@ -258,11 +258,13 @@ CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_ZSTD=y
 CONFIG_BOOT_CONFIG=y
+# CONFIG_BOOT_CONFIG_FORCE is not set
 # CONFIG_BOOT_CONFIG_EMBED is not set
 CONFIG_INITRAMFS_PRESERVE_MTIME=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_LD_ORPHAN_WARN=y
+CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
 CONFIG_SYSCTL=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
@@ -291,6 +293,7 @@ CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
@@ -332,7 +335,6 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_NR_GPIO=1024
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_HAVE_INTEL_TXT=y
@@ -486,7 +488,10 @@ CONFIG_X86_INTEL_TSX_MODE_AUTO=y
 CONFIG_X86_SGX=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
+CONFIG_EFI_HANDOVER_PROTOCOL=y
 CONFIG_EFI_MIXED=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_MAP=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
 CONFIG_HZ_300=y
@@ -524,11 +529,20 @@ CONFIG_HAVE_LIVEPATCH=y
 
 CONFIG_CC_HAS_SLS=y
 CONFIG_CC_HAS_RETURN_THUNK=y
+CONFIG_CC_HAS_ENTRY_PADDING=y
+CONFIG_FUNCTION_PADDING_CFI=11
+CONFIG_FUNCTION_PADDING_BYTES=16
+CONFIG_CALL_PADDING=y
+CONFIG_HAVE_CALL_THUNKS=y
+CONFIG_CALL_THUNKS=y
+CONFIG_PREFIX_SYMBOLS=y
 CONFIG_SPECULATION_MITIGATIONS=y
 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_RETPOLINE=y
 CONFIG_RETHUNK=y
 CONFIG_CPU_UNRET_ENTRY=y
+CONFIG_CALL_DEPTH_TRACKING=y
+# CONFIG_CALL_THUNKS_DEBUG is not set
 CONFIG_CPU_IBPB_ENTRY=y
 CONFIG_CPU_IBRS_ENTRY=y
 CONFIG_SLS=y
@@ -624,6 +638,7 @@ CONFIG_ACPI_ADXL=y
 CONFIG_ACPI_CONFIGFS=m
 CONFIG_ACPI_PFRUT=m
 CONFIG_ACPI_PCC=y
+CONFIG_ACPI_FFH=y
 CONFIG_PMIC_OPREGION=y
 CONFIG_BYTCRC_PMIC_OPREGION=y
 CONFIG_CHTCRC_PMIC_OPREGION=y
@@ -729,18 +744,21 @@ CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_NO_POLL=y
 CONFIG_KVM_XFER_TO_GUEST_WORK=y
 CONFIG_HAVE_KVM_PM_NOTIFIER=y
+CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_X86_SGX_KVM=y
 CONFIG_KVM_AMD=m
 CONFIG_KVM_AMD_SEV=y
+CONFIG_KVM_SMM=y
 CONFIG_KVM_XEN=y
 CONFIG_KVM_EXTERNAL_WRITE_TRACKING=y
 CONFIG_AS_AVX512=y
 CONFIG_AS_SHA1_NI=y
 CONFIG_AS_SHA256_NI=y
 CONFIG_AS_TPAUSE=y
+CONFIG_AS_GFNI=y
 
 #
 # General architecture-dependent options
@@ -798,6 +816,7 @@ CONFIG_MMU_GATHER_TABLE_FREE=y
 CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
 CONFIG_MMU_GATHER_MERGE_VMAS=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
@@ -891,6 +910,9 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+CONFIG_FUNCTION_ALIGNMENT_4B=y
+CONFIG_FUNCTION_ALIGNMENT_16B=y
+CONFIG_FUNCTION_ALIGNMENT=16
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -916,6 +938,7 @@ CONFIG_MODULE_SIG_HASH="sha512"
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS_XZ is not set
 CONFIG_MODULE_COMPRESS_ZSTD=y
+CONFIG_MODULE_DECOMPRESS=y
 CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
@@ -969,7 +992,6 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_CMDLINE_PARTITION is not set
 # end of Partition Types
 
-CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_MQ_RDMA=y
@@ -1026,18 +1048,19 @@ CONFIG_ZSWAP_DEFAULT_ON=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
-# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
-CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lz4"
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd"
 # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set
-CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD=y
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
-CONFIG_ZSWAP_ZPOOL_DEFAULT="z3fold"
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC=y
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zsmalloc"
 CONFIG_ZBUD=y
 CONFIG_Z3FOLD=y
 CONFIG_ZSMALLOC=y
-# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_ZSMALLOC_STAT=y
+CONFIG_ZSMALLOC_CHAIN_SIZE=8
 
 #
 # SLAB allocator options
@@ -1131,7 +1154,6 @@ CONFIG_ANON_VMA_NAME=y
 CONFIG_USERFAULTFD=y
 CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
 CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
-CONFIG_PTE_MARKER=y
 CONFIG_PTE_MARKER_UFFD_WP=y
 CONFIG_LRU_GEN=y
 CONFIG_LRU_GEN_ENABLED=y
@@ -1313,6 +1335,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CONNTRACK_OVS=y
 CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_GRE=y
 CONFIG_NF_CT_PROTO_SCTP=y
@@ -1340,6 +1363,7 @@ CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NF_NAT_OVS=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y
@@ -1354,7 +1378,6 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
@@ -1567,7 +1590,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_RAW=m
@@ -1678,6 +1700,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_BRIDGE_MRP=y
 CONFIG_BRIDGE_CFM=y
 CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_NONE=m
 CONFIG_NET_DSA_TAG_AR9331=m
 CONFIG_NET_DSA_TAG_BRCM_COMMON=m
 CONFIG_NET_DSA_TAG_BRCM=m
@@ -1738,10 +1761,8 @@ CONFIG_NET_SCHED=y
 #
 # Queueing/Scheduling
 #
-CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_RED=m
@@ -1751,9 +1772,9 @@ CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_CBS=m
 CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_MQPRIO_LIB=m
 CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
@@ -1784,14 +1805,11 @@ CONFIG_DEFAULT_NET_SCH="fq_codel"
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
 CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
@@ -1930,6 +1948,7 @@ CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 # CONFIG_BT_HS is not set
 CONFIG_BT_LE=y
+CONFIG_BT_LE_L2CAP_ECRED=y
 CONFIG_BT_6LOWPAN=m
 CONFIG_BT_LEDS=y
 CONFIG_BT_MSFTEXT=y
@@ -1947,6 +1966,7 @@ CONFIG_BT_QCA=m
 CONFIG_BT_MTK=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_POLL_SYNC=y
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
@@ -1966,6 +1986,7 @@ CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBCM4377=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIDTL1=m
@@ -1984,8 +2005,10 @@ CONFIG_BT_VIRTIO=m
 CONFIG_AF_RXRPC=m
 CONFIG_AF_RXRPC_IPV6=y
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_INJECT_RX_DELAY is not set
 CONFIG_AF_RXRPC_DEBUG=y
 CONFIG_RXKAD=y
+# CONFIG_RXPERF is not set
 CONFIG_AF_KCM=m
 CONFIG_STREAM_PARSER=y
 CONFIG_MCTP=y
@@ -2121,7 +2144,6 @@ CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_EDR=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
@@ -2195,6 +2217,7 @@ CONFIG_CXL_MEM=m
 CONFIG_CXL_PORT=m
 CONFIG_CXL_SUSPEND=y
 CONFIG_CXL_REGION=y
+# CONFIG_CXL_REGION_INVALIDATION_TEST is not set
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -2251,6 +2274,7 @@ CONFIG_HMEM_REPORTING=y
 CONFIG_SYS_HYPERVISOR=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SLIMBUS=m
@@ -2299,9 +2323,10 @@ CONFIG_FW_CFG_SYSFS=m
 # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
 CONFIG_SYSFB=y
 # CONFIG_SYSFB_SIMPLEFB is not set
-CONFIG_CS_DSP=m
+CONFIG_FW_CS_DSP=m
 CONFIG_GOOGLE_FIRMWARE=y
 # CONFIG_GOOGLE_SMI is not set
+CONFIG_GOOGLE_CBMEM=m
 CONFIG_GOOGLE_COREBOOT_TABLE=m
 CONFIG_GOOGLE_MEMCONSOLE=m
 # CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
@@ -2314,12 +2339,9 @@ CONFIG_GOOGLE_VPD=m
 CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_EFI_RUNTIME_MAP=y
-# CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_BOOTLOADER_CONTROL=m
 CONFIG_EFI_CAPSULE_LOADER=m
 # CONFIG_EFI_TEST is not set
@@ -2489,7 +2511,6 @@ CONFIG_PARPORT_SERIAL=m
 CONFIG_PARPORT_PC_FIFO=y
 CONFIG_PARPORT_PC_SUPERIO=y
 CONFIG_PARPORT_PC_PCMCIA=m
-CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_NOT_PC=y
 CONFIG_PNP=y
@@ -2504,18 +2525,18 @@ CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
 # CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
-# CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_ZRAM=m
-CONFIG_ZRAM_DEF_COMP_LZORLE=y
-# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZORLE is not set
+CONFIG_ZRAM_DEF_COMP_ZSTD=y
 # CONFIG_ZRAM_DEF_COMP_LZ4 is not set
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
 # CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
 # CONFIG_ZRAM_DEF_COMP_842 is not set
-CONFIG_ZRAM_DEF_COMP="lzo-rle"
+CONFIG_ZRAM_DEF_COMP="zstd"
 CONFIG_ZRAM_WRITEBACK=y
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_ZRAM_MULTI_COMP=y
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
 CONFIG_BLK_DEV_DRBD=m
@@ -2575,6 +2596,8 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_SMPRO_ERRMON=m
+CONFIG_SMPRO_MISC=m
 CONFIG_HP_ILO=m
 CONFIG_APDS9802ALS=m
 CONFIG_ISL29003=m
@@ -2634,7 +2657,6 @@ CONFIG_BCM_VK_TTY=y
 CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
-CONFIG_HABANA_AI=m
 CONFIG_UACCE=m
 CONFIG_PVPANIC=y
 CONFIG_PVPANIC_MMIO=m
@@ -2883,6 +2905,26 @@ CONFIG_PATA_NS87410=m
 CONFIG_PATA_OPTI=m
 CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_RZ1000=m
+CONFIG_PATA_PARPORT=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PATA_PARPORT_ATEN=m
+CONFIG_PATA_PARPORT_BPCK=m
+CONFIG_PATA_PARPORT_COMM=m
+CONFIG_PATA_PARPORT_DSTR=m
+CONFIG_PATA_PARPORT_FIT2=m
+CONFIG_PATA_PARPORT_FIT3=m
+CONFIG_PATA_PARPORT_EPAT=m
+CONFIG_PATA_PARPORT_EPATC8=y
+CONFIG_PATA_PARPORT_EPIA=m
+CONFIG_PATA_PARPORT_FRIQ=m
+CONFIG_PATA_PARPORT_FRPW=m
+CONFIG_PATA_PARPORT_KBIC=m
+CONFIG_PATA_PARPORT_KTTI=m
+CONFIG_PATA_PARPORT_ON20=m
+CONFIG_PATA_PARPORT_ON26=m
 
 #
 # Generic fallback / legacy drivers
@@ -3060,9 +3102,12 @@ CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_PTP=y
 CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_MSCC_FELIX_DSA_LIB=m
+CONFIG_NET_DSA_MSCC_OCELOT_EXT=m
 CONFIG_NET_DSA_MSCC_SEVILLE=m
 CONFIG_NET_DSA_AR9331=m
 CONFIG_NET_DSA_QCA8K=m
@@ -3238,6 +3283,7 @@ CONFIG_ICE_HWTS=y
 CONFIG_FM10K=m
 CONFIG_IGC=m
 CONFIG_NET_VENDOR_WANGXUN=y
+CONFIG_LIBWX=m
 CONFIG_NGBE=m
 CONFIG_TXGBE=m
 CONFIG_JME=m
@@ -3298,6 +3344,7 @@ CONFIG_ENC28J60=m
 # CONFIG_ENC28J60_WRITEVERIFY is not set
 CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
+CONFIG_VCAP=y
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_NET_VENDOR_MICROSOFT=y
@@ -3317,6 +3364,7 @@ CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NFP=m
 CONFIG_NFP_APP_FLOWER=y
 CONFIG_NFP_APP_ABM_NIC=y
+CONFIG_NFP_NET_IPSEC=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
@@ -3479,6 +3527,7 @@ CONFIG_MOTORCOMM_PHY=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_NXP_C45_TJA11XX_PHY=m
 CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_NCN26000_PHY=m
 CONFIG_AT803X_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
@@ -3720,6 +3769,9 @@ CONFIG_ATH11K_DEBUG=y
 CONFIG_ATH11K_DEBUGFS=y
 # CONFIG_ATH11K_TRACING is not set
 CONFIG_ATH11K_SPECTRAL=y
+CONFIG_ATH12K=m
+CONFIG_ATH12K_DEBUG=y
+CONFIG_ATH12K_TRACING=y
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
@@ -3871,6 +3923,7 @@ CONFIG_MT7921_COMMON=m
 CONFIG_MT7921E=m
 CONFIG_MT7921S=m
 CONFIG_MT7921U=m
+CONFIG_MT7996E=m
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 CONFIG_WILC1000=m
 CONFIG_WILC1000_SDIO=m
@@ -3934,22 +3987,29 @@ CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTW88=m
 CONFIG_RTW88_CORE=m
 CONFIG_RTW88_PCI=m
+CONFIG_RTW88_USB=m
 CONFIG_RTW88_8822B=m
 CONFIG_RTW88_8822C=m
 CONFIG_RTW88_8723D=m
 CONFIG_RTW88_8821C=m
 CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8822CU=m
 CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8723DU=m
 CONFIG_RTW88_8821CE=m
+CONFIG_RTW88_8821CU=m
 CONFIG_RTW88_DEBUG=y
 CONFIG_RTW88_DEBUGFS=y
 CONFIG_RTW89=m
 CONFIG_RTW89_CORE=m
 CONFIG_RTW89_PCI=m
 CONFIG_RTW89_8852A=m
+CONFIG_RTW89_8852B=m
 CONFIG_RTW89_8852C=m
 CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852BE=m
 CONFIG_RTW89_8852CE=m
 CONFIG_RTW89_DEBUG=y
 CONFIG_RTW89_DEBUGMSG=y
@@ -3974,7 +4034,6 @@ CONFIG_WL12XX=m
 CONFIG_WL18XX=m
 CONFIG_WLCORE=m
 CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
@@ -4198,6 +4257,7 @@ CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
 CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
 CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP5=m
 CONFIG_TOUCHSCREEN_DA9034=m
 CONFIG_TOUCHSCREEN_DA9052=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
@@ -4209,6 +4269,7 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_HIDEEP=m
 CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
+CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX=m
 CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_ILITEK=m
 CONFIG_TOUCHSCREEN_S6SY761=m
@@ -4232,7 +4293,6 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
 CONFIG_TOUCHSCREEN_WM831X=m
@@ -4283,6 +4343,7 @@ CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_TOUCHSCREEN_IQS5XX=m
 CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_TOUCHSCREEN_HIMAX_HX83112B=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_88PM860X_ONKEY=m
 CONFIG_INPUT_88PM80X_ONKEY=m
@@ -4400,6 +4461,7 @@ CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
 CONFIG_LDISC_AUTOLOAD=y
 
 #
@@ -4413,6 +4475,7 @@ CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_FINTEK=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCILIB=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_EXAR=m
 CONFIG_SERIAL_8250_CS=m
@@ -4421,10 +4484,12 @@ CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_PCI1XXXX=m
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_DFL=m
 CONFIG_SERIAL_8250_DW=m
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_LPSS=y
@@ -4456,7 +4521,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
-CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_SERIAL_FSL_LINFLEXUART=m
 CONFIG_SERIAL_MEN_Z135=m
 CONFIG_SERIAL_SPRD=m
@@ -4492,6 +4556,7 @@ CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_IPMB=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
+CONFIG_SSIF_IPMI_BMC=m
 CONFIG_IPMB_DEVICE_INTERFACE=m
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -4545,8 +4610,6 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-CONFIG_RANDOM_TRUST_CPU=y
-CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
@@ -4572,7 +4635,7 @@ CONFIG_I2C_MUX_MLXCPLD=m
 
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_ALGOPCA=m
 
 #
@@ -4689,6 +4752,7 @@ CONFIG_SPI_MICROCHIP_CORE=m
 CONFIG_SPI_MICROCHIP_CORE_QSPI=m
 # CONFIG_SPI_LANTIQ_SSC is not set
 CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PCI1XXXX=m
 CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=m
 # CONFIG_SPI_ROCKCHIP is not set
@@ -4803,6 +4867,7 @@ CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_MAX730X=m
+CONFIG_GPIO_IDIO_16=m
 
 #
 # Memory mapped GPIO drivers
@@ -4867,7 +4932,6 @@ CONFIG_GPIO_TPS68470=m
 CONFIG_GPIO_TQMX86=m
 CONFIG_GPIO_TWL4030=m
 CONFIG_GPIO_TWL6040=m
-CONFIG_GPIO_UCB1400=m
 CONFIG_GPIO_WHISKEY_COVE=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_WM8350=m
@@ -4904,6 +4968,7 @@ CONFIG_GPIO_VIPERBOARD=m
 # Virtual GPIO drivers
 #
 CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_LATCH=m
 CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_VIRTIO=m
 CONFIG_GPIO_SIM=m
@@ -4918,7 +4983,6 @@ CONFIG_W1_CON=y
 CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
 CONFIG_W1_MASTER_SGI=m
 # end of 1-wire Bus Masters
@@ -4955,7 +5019,6 @@ CONFIG_POWER_RESET_TPS65086=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
-CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_IP5XXX_POWER=m
 CONFIG_MAX8925_POWER=m
@@ -5025,6 +5088,8 @@ CONFIG_BATTERY_GAUGE_LTC2941=m
 CONFIG_BATTERY_GOLDFISH=m
 CONFIG_BATTERY_RT5033=m
 CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_RT9467=m
+CONFIG_CHARGER_RT9471=m
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_CROS_PCHG=m
 CONFIG_CHARGER_BD99954=m
@@ -5041,6 +5106,7 @@ CONFIG_HWMON_VID=m
 #
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_SMPRO=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
@@ -5125,6 +5191,7 @@ CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MC34VR500=m
 CONFIG_SENSORS_MCP3021=m
 CONFIG_SENSORS_MLXREG_FAN=m
 CONFIG_SENSORS_TC654=m
@@ -5160,6 +5227,9 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NZXT_KRAKEN2=m
 CONFIG_SENSORS_NZXT_SMART2=m
+CONFIG_SENSORS_OCC_P8_I2C=m
+CONFIG_SENSORS_OCC=m
+CONFIG_SENSORS_OXP=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
@@ -5195,6 +5265,8 @@ CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MP2888=m
 CONFIG_SENSORS_MP2975=m
 CONFIG_SENSORS_MP5023=m
+CONFIG_SENSORS_MPQ7932_REGULATOR=y
+CONFIG_SENSORS_MPQ7932=m
 CONFIG_SENSORS_PIM4328=m
 CONFIG_SENSORS_PLI1209BC=m
 CONFIG_SENSORS_PLI1209BC_REGULATOR=y
@@ -5202,6 +5274,8 @@ CONFIG_SENSORS_PM6764TR=m
 CONFIG_SENSORS_PXE1610=m
 CONFIG_SENSORS_Q54SJ108A2=m
 CONFIG_SENSORS_STPDDC60=m
+CONFIG_SENSORS_TDA38640=m
+CONFIG_SENSORS_TDA38640_REGULATOR=y
 CONFIG_SENSORS_TPS40422=m
 CONFIG_SENSORS_TPS53679=m
 CONFIG_SENSORS_TPS546D24=m
@@ -5282,6 +5356,7 @@ CONFIG_THERMAL_NETLINK=y
 # CONFIG_THERMAL_STATISTICS is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100
 CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_ACPI=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
@@ -5300,6 +5375,7 @@ CONFIG_DEVFREQ_THERMAL=y
 #
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_INTEL_TCC=y
 CONFIG_X86_PKG_TEMP_THERMAL=m
 CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
@@ -5364,6 +5440,7 @@ CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
+CONFIG_ADVANTECH_EC_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_EBC_C384_WDT=m
@@ -5445,6 +5522,7 @@ CONFIG_BCMA_DRIVER_GPIO=y
 #
 CONFIG_MFD_CORE=y
 CONFIG_MFD_AS3711=y
+CONFIG_MFD_SMPRO=m
 CONFIG_PMIC_ADP5520=y
 CONFIG_MFD_AAT2870_CORE=y
 CONFIG_MFD_BCM590XX=m
@@ -5473,8 +5551,6 @@ CONFIG_MFD_MC13XXX=m
 CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_MC13XXX_I2C=m
 CONFIG_MFD_MP2629=m
-CONFIG_HTC_PASIC3=m
-CONFIG_HTC_I2CPLD=y
 CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
@@ -5511,7 +5587,6 @@ CONFIG_MFD_RETU=m
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
 CONFIG_MFD_SY7636A=m
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_RT4831=m
@@ -5566,7 +5641,9 @@ CONFIG_MFD_WCD934X=m
 CONFIG_MFD_ATC260X=m
 CONFIG_MFD_ATC260X_I2C=m
 CONFIG_RAVE_SP_CORE=m
-CONFIG_MFD_INTEL_M10_BMC=m
+CONFIG_MFD_INTEL_M10_BMC_CORE=m
+CONFIG_MFD_INTEL_M10_BMC_SPI=m
+CONFIG_MFD_INTEL_M10_BMC_PMCI=m
 # end of Multifunction device drivers
 
 CONFIG_REGULATOR=y
@@ -5616,6 +5693,7 @@ CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_MAX8997=m
 CONFIG_REGULATOR_MAX8998=m
 CONFIG_REGULATOR_MAX20086=m
+CONFIG_REGULATOR_MAX20411=m
 CONFIG_REGULATOR_MAX77693=m
 CONFIG_REGULATOR_MAX77826=m
 CONFIG_REGULATOR_MC13XXX_CORE=m
@@ -5626,6 +5704,7 @@ CONFIG_REGULATOR_MT6311=m
 CONFIG_REGULATOR_MT6323=m
 CONFIG_REGULATOR_MT6331=m
 CONFIG_REGULATOR_MT6332=m
+CONFIG_REGULATOR_MT6357=m
 CONFIG_REGULATOR_MT6358=m
 CONFIG_REGULATOR_MT6359=m
 CONFIG_REGULATOR_MT6360=m
@@ -5647,6 +5726,7 @@ CONFIG_REGULATOR_RT5120=m
 CONFIG_REGULATOR_RT5190A=m
 CONFIG_REGULATOR_RT5759=m
 CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6190=m
 CONFIG_REGULATOR_RT6245=m
 CONFIG_REGULATOR_RTQ2134=m
 CONFIG_REGULATOR_RTMV20=m
@@ -5960,6 +6040,9 @@ CONFIG_VIDEO_DT3155=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_IVTV_ALSA=m
 # CONFIG_VIDEO_FB_IVTV is not set
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
 
 #
 # Media capture/analog/hybrid TV support
@@ -6003,6 +6086,10 @@ CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_PT1=m
 CONFIG_DVB_PT3=m
 CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
 CONFIG_VIDEO_IPU3_CIO2=m
 CONFIG_CIO2_BRIDGE=y
 CONFIG_RADIO_ADAPTERS=m
@@ -6049,7 +6136,6 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 #
 # Aspeed media platform drivers
 #
-CONFIG_VIDEO_ASPEED=m
 
 #
 # Atmel media platform drivers
@@ -6079,6 +6165,10 @@ CONFIG_VIDEO_CAFE_CCIC=m
 #
 
 #
+# Microchip Technology, Inc. media platform drivers
+#
+
+#
 # NVidia media platform drivers
 #
 
@@ -6137,6 +6227,8 @@ CONFIG_VIDEO_VIMC=m
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
+CONFIG_VIDEO_VISL=m
+# CONFIG_VISL_DEBUGFS is not set
 CONFIG_DVB_TEST_DRIVERS=y
 CONFIG_DVB_VIDTV=m
 
@@ -6152,9 +6244,12 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 #
 CONFIG_CYPRESS_FIRMWARE=m
 CONFIG_TTPCI_EEPROM=m
+CONFIG_UVC_COMMON=m
 CONFIG_VIDEO_CX2341X=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
 # CONFIG_SMS_SIANO_DEBUGFS is not set
@@ -6195,6 +6290,7 @@ CONFIG_VIDEO_IMX219=m
 CONFIG_VIDEO_IMX258=m
 CONFIG_VIDEO_IMX274=m
 CONFIG_VIDEO_IMX290=m
+CONFIG_VIDEO_IMX296=m
 CONFIG_VIDEO_IMX319=m
 CONFIG_VIDEO_IMX355=m
 CONFIG_VIDEO_MAX9271_LIB=m
@@ -6211,6 +6307,7 @@ CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 CONFIG_VIDEO_OV02A10=m
 CONFIG_VIDEO_OV08D10=m
+CONFIG_VIDEO_OV08X40=m
 CONFIG_VIDEO_OV13858=m
 CONFIG_VIDEO_OV13B10=m
 CONFIG_VIDEO_OV2640=m
@@ -6218,6 +6315,7 @@ CONFIG_VIDEO_OV2659=m
 CONFIG_VIDEO_OV2680=m
 CONFIG_VIDEO_OV2685=m
 CONFIG_VIDEO_OV2740=m
+CONFIG_VIDEO_OV4689=m
 CONFIG_VIDEO_OV5647=m
 CONFIG_VIDEO_OV5648=m
 CONFIG_VIDEO_OV5670=m
@@ -6231,6 +6329,7 @@ CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_OV772X=m
 CONFIG_VIDEO_OV7740=m
 CONFIG_VIDEO_OV8856=m
+CONFIG_VIDEO_OV8858=m
 CONFIG_VIDEO_OV8865=m
 CONFIG_VIDEO_OV9640=m
 CONFIG_VIDEO_OV9650=m
@@ -6239,7 +6338,6 @@ CONFIG_VIDEO_RDACM20=m
 CONFIG_VIDEO_RDACM21=m
 CONFIG_VIDEO_RJ54N1=m
 CONFIG_VIDEO_S5C73M3=m
-CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
 CONFIG_VIDEO_S5K6AA=m
@@ -6277,6 +6375,9 @@ CONFIG_VIDEO_CS53L32A=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_SONY_BTF_MPX=m
 CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_VP27SMPX=m
@@ -6399,10 +6500,13 @@ CONFIG_DVB_STV6110=m
 CONFIG_DVB_TDA10071=m
 CONFIG_DVB_TDA10086=m
 CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA8261=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TS2020=m
+CONFIG_DVB_TUA6100=m
 CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_VES1X93=m
 CONFIG_DVB_ZL10036=m
 CONFIG_DVB_ZL10039=m
 
@@ -6422,6 +6526,7 @@ CONFIG_DVB_DIB7000P=m
 CONFIG_DVB_DRXD=m
 CONFIG_DVB_EC100=m
 CONFIG_DVB_GP8PSK_FE=m
+CONFIG_DVB_L64781=m
 CONFIG_DVB_MT352=m
 CONFIG_DVB_NXT6000=m
 CONFIG_DVB_RTL2830=m
@@ -6516,6 +6621,7 @@ CONFIG_DVB_DUMMY_FE=m
 # Graphics support
 #
 CONFIG_APERTURE_HELPERS=y
+CONFIG_VIDEO_NOMODESET=y
 CONFIG_AGP=y
 CONFIG_AGP_AMD64=m
 CONFIG_AGP_INTEL=m
@@ -6527,7 +6633,6 @@ CONFIG_DRM=y
 CONFIG_DRM_MIPI_DBI=m
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
-CONFIG_DRM_USE_DYNAMIC_DEBUG=y
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
@@ -6586,7 +6691,6 @@ CONFIG_DRM_AMD_SECURE_DISPLAY=y
 CONFIG_HSA_AMD=y
 CONFIG_HSA_AMD_SVM=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
@@ -6598,7 +6702,6 @@ CONFIG_DRM_I915_FORCE_PROBE="*"
 CONFIG_DRM_I915_CAPTURE_ERROR=y
 CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
-CONFIG_DRM_I915_GVT=y
 CONFIG_DRM_I915_GVT_KVMGT=m
 CONFIG_DRM_I915_PXP=y
 CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
@@ -6606,13 +6709,14 @@ CONFIG_DRM_I915_FENCE_TIMEOUT=10000
 CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
 CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
 CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
+CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE=7500
 CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
 CONFIG_DRM_I915_STOP_TIMEOUT=100
 CONFIG_DRM_I915_TIMESLICE_DURATION=1
+CONFIG_DRM_I915_GVT=y
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX_MKSSTATS=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_UDL=m
@@ -6625,6 +6729,8 @@ CONFIG_DRM_PANEL=y
 #
 # Display Panels
 #
+CONFIG_DRM_PANEL_AUO_A030JTN01=m
+CONFIG_DRM_PANEL_ORISETECH_OTA5601A=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
 # end of Display Panels
@@ -6664,7 +6770,6 @@ CONFIG_DRM_SSD130X_SPI=m
 CONFIG_DRM_HYPERV=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-CONFIG_DRM_NOMODESET=y
 CONFIG_DRM_PRIVACY_SCREEN=y
 
 #
@@ -6729,7 +6834,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
-# CONFIG_XEN_FBDEV_FRONTEND is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_HYPERV is not set
@@ -6755,6 +6860,7 @@ CONFIG_LCD_HX8357=m
 CONFIG_LCD_OTM3225A=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_KTZ8866=m
 CONFIG_BACKLIGHT_LM3533=m
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_BACKLIGHT_DA903X=m
@@ -6806,6 +6912,9 @@ CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 # CONFIG_LOGO is not set
 # end of Graphics support
 
+CONFIG_DRM_ACCEL=y
+CONFIG_DRM_ACCEL_HABANALABS=m
+CONFIG_DRM_ACCEL_IVPU=m
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -6974,6 +7083,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
 CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
+# CONFIG_SND_HDA_CTL_DEV_ID is not set
 # end of HD-Audio
 
 CONFIG_SND_HDA_CORE=m
@@ -7117,9 +7227,11 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
 CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
@@ -7267,6 +7379,8 @@ CONFIG_SND_SOC_AK5386=m
 CONFIG_SND_SOC_AK5558=m
 CONFIG_SND_SOC_ALC5623=m
 CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_AW88395_LIB=m
+CONFIG_SND_SOC_AW88395=m
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CROS_EC_CODEC=m
@@ -7279,12 +7393,12 @@ CONFIG_SND_SOC_CS35L41_LIB=m
 CONFIG_SND_SOC_CS35L41=m
 CONFIG_SND_SOC_CS35L41_SPI=m
 CONFIG_SND_SOC_CS35L41_I2C=m
-CONFIG_SND_SOC_CS35L45_TABLES=m
 CONFIG_SND_SOC_CS35L45=m
 CONFIG_SND_SOC_CS35L45_SPI=m
 CONFIG_SND_SOC_CS35L45_I2C=m
 CONFIG_SND_SOC_CS42L42_CORE=m
 CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L42_SDW=m
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS42L51_I2C=m
 CONFIG_SND_SOC_CS42L52=m
@@ -7320,6 +7434,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDA=m
 CONFIG_SND_SOC_ICS43432=m
+CONFIG_SND_SOC_IDT821034=m
 CONFIG_SND_SOC_INNO_RK3036=m
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98090=m
@@ -7354,6 +7469,7 @@ CONFIG_SND_SOC_PCM5102A=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_PEB2466=m
 CONFIG_SND_SOC_RK3328=m
 CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RL6347A=m
@@ -7367,6 +7483,7 @@ CONFIG_SND_SOC_RT1019=m
 CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
+CONFIG_SND_SOC_RT1318_SDW=m
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5514_SPI=m
 CONFIG_SND_SOC_RT5616=m
@@ -7389,6 +7506,7 @@ CONFIG_SND_SOC_RT700_SDW=m
 CONFIG_SND_SOC_RT711=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT711_SDCA_SDW=m
+CONFIG_SND_SOC_RT712_SDCA_SDW=m
 CONFIG_SND_SOC_RT715=m
 CONFIG_SND_SOC_RT715_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
@@ -7401,6 +7519,7 @@ CONFIG_SND_SOC_SIGMADSP_I2C=m
 CONFIG_SND_SOC_SIGMADSP_REGMAP=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SIMPLE_MUX=m
+CONFIG_SND_SOC_SMA1303=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SRC4XXX_I2C=m
 CONFIG_SND_SOC_SRC4XXX=m
@@ -7471,6 +7590,7 @@ CONFIG_SND_SOC_WM8903=m
 CONFIG_SND_SOC_WM8904=m
 CONFIG_SND_SOC_WM8940=m
 CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8961=m
 CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8974=m
 CONFIG_SND_SOC_WM8978=m
@@ -7505,10 +7625,7 @@ CONFIG_SND_SYNTH_EMUX=m
 CONFIG_SND_XEN_FRONTEND=m
 CONFIG_SND_VIRTIO=m
 CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
@@ -7545,6 +7662,7 @@ CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
+CONFIG_HID_EVISION=m
 CONFIG_HID_EZKEY=m
 CONFIG_HID_FT260=m
 CONFIG_HID_GEMBIRD=m
@@ -7619,6 +7737,7 @@ CONFIG_HID_SONY=m
 CONFIG_SONY_FF=y
 CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_STEAM=m
+CONFIG_STEAM_FF=y
 CONFIG_HID_STEELSERIES=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_RMI=m
@@ -7648,6 +7767,12 @@ CONFIG_HID_MCP2221=m
 # end of Special HID drivers
 
 #
+# HID-BPF support
+#
+CONFIG_HID_BPF=y
+# end of HID-BPF support
+
+#
 # USB HID support
 #
 CONFIG_USB_HID=m
@@ -7655,12 +7780,8 @@ CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
 # end of USB HID support
 
-#
-# I2C HID support
-#
+CONFIG_I2C_HID=m
 CONFIG_I2C_HID_ACPI=m
-# end of I2C HID support
-
 CONFIG_I2C_HID_CORE=m
 
 #
@@ -7684,8 +7805,6 @@ CONFIG_SURFACE_KBD=m
 # end of Surface System Aggregator Module HID support
 
 CONFIG_SURFACE_HID_CORE=m
-# end of HID support
-
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -7726,7 +7845,6 @@ CONFIG_USB_EHCI_FSL=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_FOTG210_HCD=m
 CONFIG_USB_MAX3421_HCD=m
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PCI=y
@@ -7787,6 +7905,10 @@ CONFIG_USBIP_VHCI_NR_HCS=1
 CONFIG_USBIP_HOST=m
 CONFIG_USBIP_VUDC=m
 # CONFIG_USBIP_DEBUG is not set
+
+#
+# USB dual-mode controller drivers
+#
 CONFIG_USB_CDNS_SUPPORT=m
 CONFIG_USB_CDNS_HOST=y
 CONFIG_USB_CDNS3=m
@@ -7963,7 +8085,6 @@ CONFIG_U_SERIAL_CONSOLE=y
 #
 # USB Peripheral Controller
 #
-CONFIG_USB_FOTG210_UDC=m
 CONFIG_USB_GR_UDC=m
 CONFIG_USB_R8A66597=m
 CONFIG_USB_PXA27X=m
@@ -8086,6 +8207,7 @@ CONFIG_TYPEC_WUSB3801=m
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
 CONFIG_TYPEC_MUX_FSA4480=m
+CONFIG_TYPEC_MUX_GPIO_SBU=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
 CONFIG_TYPEC_MUX_INTEL_PMC=m
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support
@@ -8143,7 +8265,6 @@ CONFIG_SCSI_UFSHCD_PCI=m
 # CONFIG_SCSI_UFS_DWC_TC_PCI is not set
 CONFIG_SCSI_UFSHCD_PLATFORM=m
 CONFIG_SCSI_UFS_CDNS_PLATFORM=m
-# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -8298,6 +8419,7 @@ CONFIG_INFINIBAND_HFI1=m
 # CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
 # CONFIG_SDMA_VERBOSITY is not set
 CONFIG_INFINIBAND_IRDMA=m
+CONFIG_MANA_INFINIBAND=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
 CONFIG_INFINIBAND_MTHCA=m
@@ -8339,7 +8461,6 @@ CONFIG_EDAC_IE31200=m
 CONFIG_EDAC_X38=m
 CONFIG_EDAC_I5400=m
 CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I7300=m
 CONFIG_EDAC_SBRIDGE=m
@@ -8466,7 +8587,6 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MSM6242=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_WM831X=m
 CONFIG_RTC_DRV_WM8350=m
 CONFIG_RTC_DRV_PCF50633=m
@@ -8504,6 +8624,7 @@ CONFIG_INTEL_IDXD_SVM=y
 CONFIG_INTEL_IDXD_PERFMON=y
 CONFIG_INTEL_IOATDMA=m
 CONFIG_PLX_DMA=m
+CONFIG_XILINX_XDMA=m
 CONFIG_AMD_PTDMA=m
 CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QCOM_HIDMA=m
@@ -8554,9 +8675,10 @@ CONFIG_UIO_MF624=m
 CONFIG_UIO_HV_GENERIC=m
 CONFIG_UIO_DFL=m
 CONFIG_VFIO=m
+CONFIG_VFIO_CONTAINER=y
 CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
 # CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_VIRQFD=y
 CONFIG_VFIO_PCI_CORE=m
 CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
@@ -8573,6 +8695,7 @@ CONFIG_NITRO_ENCLAVES=m
 CONFIG_ACRN_HSM=m
 CONFIG_EFI_SECRET=m
 CONFIG_SEV_GUEST=m
+CONFIG_TDX_GUEST_DRIVER=m
 CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI_LIB=m
@@ -8596,8 +8719,10 @@ CONFIG_VDPA_USER=m
 CONFIG_IFCVF=m
 CONFIG_MLX5_VDPA=y
 CONFIG_MLX5_VDPA_NET=m
+# CONFIG_MLX5_VDPA_STEERING_DEBUG is not set
 CONFIG_VP_VDPA=m
 CONFIG_ALIBABA_ENI_VDPA=m
+CONFIG_SNET_VDPA=m
 CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST_RING=m
 CONFIG_VHOST=m
@@ -8668,7 +8793,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
 CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
-CONFIG_R8188EU=m
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -8728,17 +8852,12 @@ CONFIG_AD2S1210=m
 
 # CONFIG_FB_SM750 is not set
 CONFIG_STAGING_MEDIA=y
-CONFIG_INTEL_ATOMISP=y
-CONFIG_VIDEO_ATOMISP=m
-CONFIG_VIDEO_ATOMISP_ISP2401=y
-CONFIG_VIDEO_ATOMISP_OV2722=m
-CONFIG_VIDEO_ATOMISP_GC2235=m
-CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER=m
-CONFIG_VIDEO_ATOMISP_MT9M114=m
-CONFIG_VIDEO_ATOMISP_GC0310=m
-CONFIG_VIDEO_ATOMISP_OV2680=m
-CONFIG_VIDEO_ATOMISP_OV5693=m
-CONFIG_VIDEO_ATOMISP_LM3554=m
+# CONFIG_INTEL_ATOMISP is not set
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_SP8870=m
 CONFIG_VIDEO_IPU3_IMGU=m
 # CONFIG_STAGING_MEDIA_DEPRECATED is not set
 CONFIG_LTE_GDM724X=m
@@ -8761,6 +8880,7 @@ CONFIG_CROS_EC=m
 CONFIG_CROS_EC_I2C=m
 CONFIG_CROS_EC_ISHTP=m
 CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_UART=m
 CONFIG_CROS_EC_LPC=m
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
@@ -8770,6 +8890,7 @@ CONFIG_CROS_EC_DEBUGFS=m
 CONFIG_CROS_EC_SENSORHUB=m
 CONFIG_CROS_EC_SYSFS=m
 CONFIG_CROS_EC_TYPEC=m
+CONFIG_CROS_HPS_I2C=m
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CROS_USBPD_NOTIFY=m
 CONFIG_CHROMEOS_PRIVACY_SCREEN=m
@@ -8839,15 +8960,17 @@ CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_PRIVACY=y
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_DESCRIPTOR=m
+CONFIG_DELL_WMI_DDV=m
 CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_WMI_SYSMAN=m
 CONFIG_AMILO_RFKILL=m
 CONFIG_FUJITSU_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
 CONFIG_HP_ACCEL=m
-CONFIG_WIRELESS_HOTKEY=m
 CONFIG_HP_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_SENSORS_HDAPS=m
@@ -8861,6 +8984,8 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_LMI=m
 CONFIG_INTEL_ATOMISP2_PDX86=y
 CONFIG_INTEL_ATOMISP2_LED=m
+CONFIG_INTEL_ATOMISP2_PM=m
+CONFIG_INTEL_IFS=m
 CONFIG_INTEL_SAR_INT1092=m
 CONFIG_INTEL_SKL_INT3472=m
 CONFIG_INTEL_PMC_CORE=y
@@ -8898,6 +9023,7 @@ CONFIG_INTEL_PUNIT_IPC=m
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SDSI=m
 CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_INTEL_TPMI=m
 CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_VSEC=m
 CONFIG_MSI_LAPTOP=m
@@ -8986,6 +9112,8 @@ CONFIG_INTEL_IOMMU_SVM=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y
+CONFIG_INTEL_IOMMU_PERF_EVENTS=y
+CONFIG_IOMMUFD=m
 CONFIG_IRQ_REMAP=y
 CONFIG_HYPERV_IOMMU=y
 CONFIG_VIRTIO_IOMMU=m
@@ -9053,6 +9181,8 @@ CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 #
 # end of Enable LiteX SoC Builder specific drivers
 
+CONFIG_WPCM450_SOC=m
+
 #
 # Qualcomm SoC drivers
 #
@@ -9162,6 +9292,9 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_IIO_KX022A=m
+CONFIG_IIO_KX022A_SPI=m
+CONFIG_IIO_KX022A_I2C=m
 CONFIG_KXSD9=m
 CONFIG_KXSD9_SPI=m
 CONFIG_KXSD9_I2C=m
@@ -9188,6 +9321,7 @@ CONFIG_STK8BA50=m
 # Analog to digital converters
 #
 CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD4130=m
 CONFIG_AD7091R5=m
 CONFIG_AD7124=m
 CONFIG_AD7192=m
@@ -9228,6 +9362,7 @@ CONFIG_MAX1027=m
 CONFIG_MAX11100=m
 CONFIG_MAX1118=m
 CONFIG_MAX11205=m
+CONFIG_MAX11410=m
 CONFIG_MAX1241=m
 CONFIG_MAX1363=m
 CONFIG_MAX9611=m
@@ -9235,6 +9370,7 @@ CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 CONFIG_MCP3911=m
 CONFIG_MEDIATEK_MT6360_ADC=m
+CONFIG_MEDIATEK_MT6370_ADC=m
 CONFIG_MEN_Z188_ADC=m
 CONFIG_MP2629_ADC=m
 CONFIG_NAU7802=m
@@ -9249,12 +9385,14 @@ CONFIG_TI_ADC108S102=m
 CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS7924=m
 CONFIG_TI_ADS7950=m
 CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_ADS124S08=m
 CONFIG_TI_ADS131E08=m
 CONFIG_TI_AM335X_ADC=m
+CONFIG_TI_LMP92064=m
 CONFIG_TI_TLC4541=m
 CONFIG_TI_TSC2046=m
 CONFIG_TWL4030_MADC=m
@@ -9267,6 +9405,7 @@ CONFIG_XILINX_XADC=m
 #
 # Analog to digital and digital to analog converters
 #
+CONFIG_AD74115=m
 CONFIG_AD74413R=m
 # end of Analog to digital and digital to analog converters
 
@@ -9379,6 +9518,7 @@ CONFIG_LTC1660=m
 CONFIG_LTC2632=m
 CONFIG_M62332=m
 CONFIG_MAX517=m
+CONFIG_MAX5522=m
 CONFIG_MAX5821=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
@@ -9416,6 +9556,7 @@ CONFIG_AD9523=m
 #
 CONFIG_ADF4350=m
 CONFIG_ADF4371=m
+CONFIG_ADF4377=m
 CONFIG_ADMV1013=m
 CONFIG_ADMV1014=m
 CONFIG_ADMV4420=m
@@ -9592,6 +9733,7 @@ CONFIG_SENSORS_HMC5843_SPI=m
 CONFIG_SENSORS_RM3100=m
 CONFIG_SENSORS_RM3100_I2C=m
 CONFIG_SENSORS_RM3100_SPI=m
+CONFIG_TI_TMAG5273=m
 CONFIG_YAMAHA_YAS530=m
 # end of Magnetometer sensors
 
@@ -9724,6 +9866,7 @@ CONFIG_TMP007=m
 CONFIG_TMP117=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
+CONFIG_MAX30208=m
 CONFIG_MAX31856=m
 CONFIG_MAX31865=m
 # end of Temperature sensors
@@ -9830,6 +9973,7 @@ CONFIG_DAX=y
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM=m
 CONFIG_DEV_DAX_HMEM=m
+CONFIG_DEV_DAX_CXL=m
 CONFIG_DEV_DAX_HMEM_DEVICES=y
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_NVMEM=y
@@ -9877,6 +10021,8 @@ CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000=m
 CONFIG_FPGA_DFL_PCI=m
 CONFIG_FPGA_M10_BMC_SEC_UPDATE=m
 CONFIG_FPGA_MGR_MICROCHIP_SPI=m
+CONFIG_FPGA_MGR_LATTICE_SYSCONFIG=m
+CONFIG_FPGA_MGR_LATTICE_SYSCONFIG_SPI=m
 CONFIG_TEE=m
 CONFIG_AMDTEE=m
 CONFIG_MULTIPLEXER=m
@@ -9896,8 +10042,8 @@ CONFIG_SLIMBUS=m
 CONFIG_SLIM_QCOM_CTRL=m
 CONFIG_INTERCONNECT=y
 CONFIG_COUNTER=m
-CONFIG_INTERRUPT_CNT=m
 CONFIG_INTEL_QEP=m
+CONFIG_INTERRUPT_CNT=m
 CONFIG_MOST=m
 CONFIG_MOST_USB_HDM=m
 CONFIG_MOST_CDEV=m
@@ -9912,6 +10058,7 @@ CONFIG_HTE=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_VALIDATE_FS_PARSER=y
 CONFIG_FS_IOMAP=y
+CONFIG_LEGACY_DIRECT_IO=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=m
@@ -9984,7 +10131,6 @@ CONFIG_FS_ENCRYPTION=y
 CONFIG_FS_ENCRYPTION_ALGS=m
 CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
 CONFIG_FS_VERITY=y
-# CONFIG_FS_VERITY_DEBUG is not set
 CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
@@ -10120,9 +10266,11 @@ CONFIG_CRAMFS_MTD=y
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_DECOMP_MULTI=y
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT=y
+CONFIG_SQUASHFS_MOUNT_DECOMP_THREADS=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
@@ -10179,6 +10327,8 @@ CONFIG_EROFS_FS_SECURITY=y
 CONFIG_EROFS_FS_ZIP=y
 CONFIG_EROFS_FS_ZIP_LZMA=y
 CONFIG_EROFS_FS_ONDEMAND=y
+CONFIG_EROFS_FS_PCPU_KTHREAD=y
+CONFIG_EROFS_FS_PCPU_KTHREAD_HIPRI=y
 CONFIG_VBOXSF_FS=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
@@ -10202,7 +10352,7 @@ CONFIG_NFS_DEBUG=y
 # CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
 # CONFIG_NFS_V4_2_READ_PLUS is not set
 CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
+# CONFIG_NFSD_V2 is not set
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_PNFS=y
@@ -10222,7 +10372,11 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y
+# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
@@ -10453,7 +10607,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_PCRYPT=m
@@ -10572,7 +10725,7 @@ CONFIG_CRYPTO_CRC64_ROCKSOFT=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_LZ4=y
+CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ZSTD=y
 # end of Compression
@@ -10626,6 +10779,8 @@ CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
 CONFIG_CRYPTO_NHPOLY1305_SSE2=m
@@ -10725,6 +10880,7 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_GF128MUL=m
 CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
@@ -10767,7 +10923,7 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=y
+CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4HC_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_ZSTD_COMMON=y
@@ -10801,6 +10957,7 @@ CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
 CONFIG_BTREE=y
 CONFIG_INTERVAL_TREE=y
+CONFIG_INTERVAL_TREE_SPAN_ITER=y
 CONFIG_XARRAY_MULTI=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
@@ -10829,7 +10986,6 @@ CONFIG_CMA_ALIGNMENT=8
 # CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_CHECK_SIGNATURE=y
-# CONFIG_FORCE_NR_CPUS is not set
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
@@ -10864,6 +11020,7 @@ CONFIG_FONT_TER16x32=y
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_COPY_MC=y
 CONFIG_ARCH_STACKWALK=y
@@ -10910,10 +11067,13 @@ CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 CONFIG_DEBUG_INFO_DWARF5=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_INFO_COMPRESSED is not set
+CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
+# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
+# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
 CONFIG_DEBUG_INFO_BTF_MODULES=y
 # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set
 # CONFIG_GDB_SCRIPTS is not set
@@ -10972,10 +11132,10 @@ CONFIG_DEBUG_WX=y
 CONFIG_GENERIC_PTDUMP=y
 CONFIG_PTDUMP_CORE=y
 # CONFIG_PTDUMP_DEBUGFS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-CONFIG_SHRINKER_DEBUG=y
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_OBJECTS is not set
+CONFIG_SHRINKER_DEBUG=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 CONFIG_SCHED_STACK_END_CHECK=y
 CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
@@ -11054,6 +11214,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_CSD_LOCK_WAIT_DEBUG is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)
 
+# CONFIG_NMI_CHECK_CPU is not set
 # CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
@@ -11080,6 +11241,7 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_RCU_REF_SCALE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
+# CONFIG_RCU_CPU_STALL_CPUTIME is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging
@@ -11087,6 +11249,7 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 CONFIG_LATENCYTOP=y
+# CONFIG_DEBUG_CGROUP_REF is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_RETHOOK=y
@@ -11102,6 +11265,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_FENTRY=y
 CONFIG_HAVE_OBJTOOL_MCOUNT=y
+CONFIG_HAVE_OBJTOOL_NOP_MCOUNT=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
 CONFIG_BUILDTIME_MCOUNT_SORT=y
@@ -11209,6 +11373,7 @@ CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_TEST_DHRY is not set
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_MIN_HEAP is not set
 # CONFIG_TEST_DIV64 is not set
@@ -11223,7 +11388,6 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_STRING_SELFTEST 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_SCANF is not set
@@ -11232,7 +11396,6 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_XARRAY is not set
 # CONFIG_TEST_MAPLE_TREE is not set
 # CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_PARMAN is not set
 # CONFIG_TEST_LKM is not set