From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 645ACC433F5 for ; Thu, 28 Oct 2021 03:06:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3553160FC0 for ; Thu, 28 Oct 2021 03:06:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229675AbhJ1DJO (ORCPT ); Wed, 27 Oct 2021 23:09:14 -0400 Received: from gandalf.ozlabs.org ([150.107.74.76]:53797 "EHLO gandalf.ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229624AbhJ1DJN (ORCPT ); Wed, 27 Oct 2021 23:09:13 -0400 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Hfr7T3y8vz4xbG; Thu, 28 Oct 2021 14:06:45 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1635390406; bh=4Z8RtmBKEJZe9Dzrso/ZzzvU182TDgKKdlUvm24xPcc=; h=Date:From:To:Cc:Subject:From; b=iE2wIJLQnajkbaOC0p8SN+VqXMxMmDjNKMRjB/ThC2eUFpAN2TepbOCzArPSzK5kp EMvJfYZGRExhD+o3X8KdDRuZxEL5BfigX9zClkuYkbkZtmwd0A1GTTx4WKQrLyTQ8x SwJv8OF8CFJBpt2jYgTxnnn/7yaL1uR5tvVBDQcjsx0nCDtUDH1nq8DMj0rPLzLyjE RYjkDVXOaMgepKDZIAsP1kQDBqIWSckX256Epbcyg38u+9DFK9qJrUgrw7iJ1mL/fN H0BU1CGImShqGT0YSEx0b0HRZXOHdo9hA9hMMKnTWpzDX6YbME1wHQIYwY0zsAUO5k rlh9JId1he0lw== Date: Thu, 28 Oct 2021 14:06:44 +1100 From: Stephen Rothwell To: Alex Deucher , Dave Airlie , DRI Cc: Alex Deucher , Bhawanpreet Lakha , Fangzhi Zuo , Linux Kernel Mailing List , Linux Next Mailing List , Lyude Paul Subject: linux-next: manual merge of the amdgpu tree with the drm tree Message-ID: <20211028140644.7c1a7244@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/IspTBx_avmFxEn8ysc4IXMj"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/IspTBx_avmFxEn8ysc4IXMj Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the amdgpu tree got conflicts in: drivers/gpu/drm/amd/display/dc/core/dc_link.c drivers/gpu/drm/drm_dp_mst_topology.c drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c between commits: d740e0bf8ed4 ("drm/amd/display: Add DP 2.0 MST DC Support") 41724ea273cd ("drm/amd/display: Add DP 2.0 MST DM Support") 00f965e700ef ("drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DCN i= s not set") from the drm tree and commits: 6d23be5bc661 ("drm/amd/display: Add DP 2.0 MST DC Support") 39b3c728e5ca ("drm/amd/display: Add DP 2.0 MST DM Support") 8bc3824f0ee2 ("drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DCN i= s not set") from the amdgpu tree. The conflicts between these different versions of the same patches, and some other changes in the amdgpu tree are just a mess today, do I have just dropped the amdgpu tree completely for today. --=20 Cheers, Stephen Rothwell --Sig_/IspTBx_avmFxEn8ysc4IXMj Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmF6E8QACgkQAVBC80lX 0GwgEQgAm5ybNqy8bFm4dY5XXBEam6vgcOXi295gvzOh9eqDwpkHcuisfEcakVrP 3kfi/w+0NSowxmkzY9kfFjnJ+7oidophRJkaQK2TsK3ZsyjZtvVflfuD9dNl6dU+ gfWmRxo4dCaNlkAJeH3AUhsk3NLn6/tFe4zTNa9umi0f0vQlNQeMn0bpQM8xM1Jn oJxpdCK0+33wDzYdpo0vbwYNz8OjRiYiG4nLbml666ShXX/6v0XQ4r6eDC+fHVzG Vv/QfBlQmHXphYroIL5OJDpOG1adpmZXBldBrgPxbYZzXdGZk/ZfkVj2VPz+Ha5V VHnMGR6UZ504S871ApwEGVKloT4G+Q== =CF/T -----END PGP SIGNATURE----- --Sig_/IspTBx_avmFxEn8ysc4IXMj--