From: Alex Deucher <alexdeucher@gmail.com>
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>
Subject: Re: linux-next: manual merge of the amdgpu tree with the drm tree
Date: Wed, 27 Oct 2021 23:22:15 -0400 [thread overview]
Message-ID: <CADnq5_PLXWpPK=BV6AS8QaPcnAr8JELF8u2Cvn_FCqJwB33AMg@mail.gmail.com> (raw)
In-Reply-To: <20211028140644.7c1a7244@canb.auug.org.au>
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
next prev parent reply other threads:[~2021-10-28 3:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-28 3:06 linux-next: manual merge of the amdgpu tree with the drm tree Stephen Rothwell
2021-10-28 3:22 ` Alex Deucher [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-07-26 1:10 Stephen Rothwell
2022-11-22 1:28 Stephen Rothwell
2022-10-27 23:57 Stephen Rothwell
2022-04-29 1:03 Stephen Rothwell
2020-11-17 0:31 Stephen Rothwell
2020-11-16 2:03 Stephen Rothwell
2020-04-23 2:13 Stephen Rothwell
2020-02-28 0:21 Stephen Rothwell
2020-02-23 23:38 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CADnq5_PLXWpPK=BV6AS8QaPcnAr8JELF8u2Cvn_FCqJwB33AMg@mail.gmail.com' \
--to=alexdeucher@gmail.com \
--cc=Bhawanpreet.Lakha@amd.com \
--cc=Jerry.Zuo@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lyude@redhat.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).