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;
MIME-Version: 1.0
References: <20211028140644.7c1a7244@canb.auug.org.au>
In-Reply-To: <20211028140644.7c1a7244@canb.auug.org.au>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Wed, 27 Oct 2021 23:22:15 -0400
Message-ID: <CADnq5_PLXWpPK=BV6AS8QaPcnAr8JELF8u2Cvn_FCqJwB33AMg@mail.gmail.com>
Subject: Re: linux-next: manual merge of the amdgpu tree with the drm tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Dave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>,
        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>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, Oct 27, 2021 at 11:06 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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 is 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 is 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.

Those patches were just in my tree while I was waiting for the topic
branch to land in drm-next.  I'll drop them from my tree tomorrow.

Alex

>
> --
> Cheers,
> Stephen Rothwell