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

Hi all, On Fri, 8 May 2020 14:34:57 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the amdgpu tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > > between commit: > > e07515563d01 ("PM: sleep: core: Rename DPM_FLAG_NEVER_SKIP") > > from the pm tree and c

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

On Friday, May 8, 2020 6:34:57 AM CEST Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the amdgpu tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > > between commit: > > e07515563d01 ("PM: sleep: core: Rename DPM_FLAG_NEVER_SKIP") > > from the pm tree

linux-next: manual merge of the amdgpu tree with the pm tree

Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c between commit: e07515563d01 ("PM: sleep: core: Rename DPM_FLAG_NEVER_SKIP") from the pm tree and commit: 500bd19a7e5d ("drm/amdgpu: only set DPM_FLAG_NEVER_SKIP for legacy ATP