lkml.org 
[lkml]   [2021]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the amdgpu tree with the drm tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-10-28 05:07    [W:0.086 / U:0.232 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site