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

Hi all, On Mon, 12 Oct 2020 15:15:27 +1100 Stephen Rothwell wrote: > > On Wed, 23 Sep 2020 15:13:36 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the tip tree got a conflict in: > > > > drivers/gpu/drm/amd/amdkfd/kfd_priv.h > > > > between commit: > > > >

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

Hi all, On Wed, 23 Sep 2020 15:13:36 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/gpu/drm/amd/amdkfd/kfd_priv.h > > between commit: > > 59d7115dae02 ("drm/amdkfd: Move process doorbell allocation into kfd > device") > > from

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

Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/gpu/drm/amd/amdkfd/kfd_priv.h between commit: 59d7115dae02 ("drm/amdkfd: Move process doorbell allocation into kfd device") from the amdgpu tree and commit: c7b6bac9c72c ("drm, iommu: Change type of pasid to