Re: linux-next: manual merge of the drm-misc tree with the admgpu tree

Hi all, This is now a conflict between the amdgpu tree and the drm tree. On Fri, 4 Oct 2019 11:10:22 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > > between commit: > >

linux-next: manual merge of the drm-misc tree with the admgpu tree

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c between commit: 2f232cf29e03 ("drm/amdgpu/dm/mst: Don't create MST topology managers for eDP ports") from the admgpu tree and commit: ae85b0df124f ("drm_