linux-next: manual merge of the amdgpu tree with Linus' tree

Hi all,

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

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

between commits:

87612bab9656 ("amdkfd: Only ignore -ENOENT for KFD init failuires")

from Linus' tree and commit:

0d831487b5be ("drm/amdgpu: nuke amdgpu_userq_fence_slab v2")

from the amdgpu tree.

I fixed it up by using the version from the amdgpu tree, which already contains a version of the commit from Linus' tree. 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.