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
Date: Thu, 28 Oct 2021 14:06:44 +1100 [thread overview]
Message-ID: <20211028140644.7c1a7244@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 963 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-10-28 3:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-28 3:06 Stephen Rothwell [this message]
2021-10-28 3:22 ` linux-next: manual merge of the amdgpu tree with the drm tree Alex Deucher
-- strict thread matches above, loose matches on Subject: below --
2025-02-20 1:28 Stephen Rothwell
2024-11-05 1:28 Stephen Rothwell
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=20211028140644.7c1a7244@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Bhawanpreet.Lakha@amd$(echo .)com \
--cc=Jerry.Zuo@amd$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=alexander.deucher@amd$(echo .)com \
--cc=alexdeucher@gmail$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lyude@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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