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

[Mark Brown]

Hi all,

Today's linux-next merge of the amdgpu tree got a conflict in:

  drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c

between commit:

  1142738572ef3 ("drm/amdkfd: Fix SMI event PID reporting for containers")

from the origin tree and commits:

  60271ec06e04b ("drm/amdkfd: Fix SMI event PID reporting for containers")
  9ba9a1486312d ("drm/amdkfd: use scnprintf/vscnprintf in kfd_smi_event_add")

from the amdgpu 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_smi_events.c
index e659cd50eb0bd,6a7b4d959541b..0000000000000
--- a/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c

Attachment: signature.asc
Description: PGP signature