Hi all,

On Mon, 12 Oct 2020 15:15:27 +1100 Stephen Rothwell sfr@canb.auug.org.au wrote:

On Wed, 23 Sep 2020 15:13:36 +1000 Stephen Rothwell sfr@canb.auug.org.au 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 the amdgpu tree and commit:

c7b6bac9c72c ("drm, iommu: Change type of pasid to u32")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_priv.h index 739db04080d0,922ae138ab85..000000000000 --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h @@@ -739,7 -723,8 +739,7 @@@ struct kfd_process /* We want to receive a notification when the mm_struct is destroyed */ struct mmu_notifier mmu_notifier;

• uint16_t pasid;

• u32 pasid;

• unsigned int doorbell_index;

  /*

  • List of kfd_process_device structures,

This is now a conflict between the tip tree and the drm tree.

This is now a conflict between the drm tree and Linus' tree.