linux-kernel - linux-next: bad merge of the drm tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250729093903.386848f3@canb.auug.org.au>
Date: Tue, 29 Jul 2025 09:39:03 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dave Airlie <airlied@...hat.com>
Cc: Alex Deucher <alexdeucher@...il.com>, DRI
 <dri-devel@...ts.freedesktop.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: bad merge of the drm tree with Linus' tree

Hi all,

Merging the drm tree with Linus' tree results in two copies of the
dc_get_host_router_index() function (due to a duplicated commit in
Linus' tree).  I have been applying the following merge fix for a while
- originally to the merge of the amdgpu tree and recently to the merge
of the drm tree.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Fri, 20 Jun 2025 14:51:48 +1000
Subject: [PATCH] fix up bad merge of the amdgpu tree

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/gpu/drm/amd/display/dc/core/dc.c | 28 ------------------------
 1 file changed, 28 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 2628f16f77c1..c744aa9d830f 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -6384,35 +6384,6 @@ unsigned int dc_get_det_buffer_size_from_state(const struct dc_state *context)
 	else
 		return 0;
 }
-/**
- ***********************************************************************************************
- * dc_get_host_router_index: Get index of host router from a dpia link
- *
- * This function return a host router index of the target link. If the target link is dpia link.
- *
- * @param [in] link: target link
- * @param [out] host_router_index: host router index of the target link
- *
- * @return: true if the host router index is found and valid.
- *
- ***********************************************************************************************
- */
-bool dc_get_host_router_index(const struct dc_link *link, unsigned int *host_router_index)
-{
-	struct dc *dc = link->ctx->dc;
-
-	if (link->ep_type != DISPLAY_ENDPOINT_USB4_DPIA)
-		return false;
-
-	if (link->link_index < dc->lowest_dpia_link_index)
-		return false;
-
-	*host_router_index = (link->link_index - dc->lowest_dpia_link_index) / dc->caps.num_of_dpias_per_host_router;
-	if (*host_router_index < dc->caps.num_of_host_routers)
-		return true;
-	else
-		return false;
-}
 
 /**
  * dc_get_host_router_index: Get index of host router from a dpia link

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped