Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 28 Oct 2021 14:06:44 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Alex Deucher <alexdeucher@gmail.com>,
        Dave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     Alex Deucher <alexander.deucher@amd.com>,
        Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>,
        Fangzhi Zuo <Jerry.Zuo@amd.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lyude Paul <lyude@redhat.com>
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

--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--