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

[Mark Brown]

Hi all,

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

  drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c

between commits:

  65b5c326ce410 ("drm/amdgpu/userq: refcount userqueues to avoid any race conditions")
  64ac7c09fc449 ("drm/amdgpu: add upper bound check on user inputs in wait ioctl")

from the drm-fixes tree and commits:

  750cbc4fbd490 ("drm/amdgpu: Drop redundant syncobj handle limit checks in userq ioctls")
  4952189b284d4 ("drm/amdgpu/userq: refcount userqueues to avoid any race conditions")

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/amdgpu/amdgpu_userq_fence.c
index 5239b06b9ab03,d8ce7b3733e75..0000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c

Attachment: signature.asc
Description: PGP signature