Re: linux-next: manual merge of the drm-intel tree with the amdgpu tree

Hi all, On Mon, 20 Nov 2023 12:28:18 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c > > between commits: > > a58555359a9f ("drm/amd/display: Fix DSC not Enabled on Direct

linux-next: manual merge of the drm-intel tree with the amdgpu tree

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c between commits: a58555359a9f ("drm/amd/display: Fix DSC not Enabled on Direct MST Sink") c29085d29562 ("drm/amd/display: Enable DSC Flag in MST Mode Valid