From nobody Sun Oct 5 23:42:36 2025 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 48A59238C35; Mon, 28 Jul 2025 23:39:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753745949; cv=none; b=VFAjvRw4RjeUNrNmhhJcJIDYqHwOWuzemSM/Pl8j74xoT4TtWA7IaOTOajUCuWL0ZWgEqEb5yPgchOBR+G0ikYy/VWgLYHe6KuTilAGd1FHgLscAcVmWQtKHNjucXfj/hC7N4eSDRl+uEqqoapjAIT7ibuexenzfu5GPkQo00iY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753745949; c=relaxed/simple; bh=/T8UuzPObJHErlTUQwxtuFC6jCxKUV+YJQ+2ZGk46Ck=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=X6d/4h4a/7fv5voEIdFCS+7DtEN+RLrw5lH5de3NxXRRXRsYcaJH8M+Hjsc8nD9AHCoiOiU8MeC4DnNOQBEJiodH0LZWDTqpKn17BQnQd8YmEMR8MOZ859CoVTO2MHlOM1LqXaCM/Ba+f7ffQS+hrf3CNaj13kunt2XZnyD5OAA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=pT7Bf6pB; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="pT7Bf6pB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=202503; t=1753745737; bh=P6aPRjcgZ0UmDvuH8/g7TWfwU39ztlV1xDp/3KzlwlU=; h=Date:From:To:Cc:Subject:From; b=pT7Bf6pB7LH9+ttNeg4qPeyUhjtbKcgTAiU7O5QEn6pHm+E9sOsBbWtwv9AiQsJGS 7/yIldnLGGL5ymbQwZLekZjbEWhVZ5i4kGOjLLBky6LM50UejZqrHPFTsaNqeMpUfV 4CUQquBlsoII8rgpJEWm7VwwjrgU0CGFAJh6+E0WzilYr0GVptaf8SNmh8lpSBDqrW mvK5AiRphI3aEm+Zu8o1dZE2fdIQ0rIHc1i8hofXClzRBnBUU/DaIEEyjU38ipBZhf OEbR/7Tc93d2Y4P9eiWqcvyXBueNq95oA/sZe09I20Hm5Fm4ED6S+O2XGzZZctbxPe SHcZuPMxvqsMA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4brZbY0xb2z4w2N; Tue, 29 Jul 2025 09:35:36 +1000 (AEST) Date: Tue, 29 Jul 2025 09:39:03 +1000 From: Stephen Rothwell To: Dave Airlie Cc: Alex Deucher , DRI , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: bad merge of the drm tree with Linus' tree Message-ID: <20250729093903.386848f3@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/g_fgtX5w1WT5HzhjFJZq6Yr"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/g_fgtX5w1WT5HzhjFJZq6Yr Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Date: Fri, 20 Jun 2025 14:51:48 +1000 Subject: [PATCH] fix up bad merge of the amdgpu tree Signed-off-by: Stephen Rothwell --- 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 tar= get 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 *ho= st_router_index) -{ - struct dc *dc =3D link->ctx->dc; - - if (link->ep_type !=3D DISPLAY_ENDPOINT_USB4_DPIA) - return false; - - if (link->link_index < dc->lowest_dpia_link_index) - return false; - - *host_router_index =3D (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; -} =20 /** * dc_get_host_router_index: Get index of host router from a dpia link --=20 Cheers, Stephen Rothwell --Sig_/g_fgtX5w1WT5HzhjFJZq6Yr Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmiIChcACgkQAVBC80lX 0Gx+wAgAoA8XH5Owmxu/ZtqVJWzPJw+fKh6dftKWQtxfCA0dwJpuyEcQHrUQ4FGj P6fPu4noenV7yIfIbNEbzGygQn70Q8ymBxJR9MW+PuBP5Afc/GX/vIGeSxzSEbBa LlFubqubLtRuCakrsISSU7FG3AnSW5yefte4Q6w8icENs+dP1I0wnIsIChN36eRo tcYICIuUgMBfH7Dvm2A6rbWDQUUzqXsRpUbrh+hTQ6tOiMzCzEddyE8oiqpEnTc+ MYZ6JqZi0mzmDszBFBWuXNx3LxWXUCDCKR5XpDBOv3ty8zJWQ/TGnorFSs1ajLWd nuz1Rn6gGx/zBueSsHFpG03CLtoNWg== =jMID -----END PGP SIGNATURE----- --Sig_/g_fgtX5w1WT5HzhjFJZq6Yr--