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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1350 bytes --]

Hi all,

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

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

between commit:

  8a206685d36f ("drm/amdgpu: use drm_exec for GEM and CSA handling v2")

from the drm tree and commit:

  30953c4d000b ("drm/amdgpu: Fix style issues in amdgpu_gem.c")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 7da871972a8e,992dfd3de49c..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@@ -226,9 -229,6 +225,9 @@@ static void amdgpu_gem_object_close(str
  		goto out_unlock;
  
  	r = amdgpu_vm_clear_freed(adev, vm, &fence);
 +	if (unlikely(r < 0))
- 		dev_err(adev->dev, "failed to clear page "
- 			"tables on GEM object close (%ld)\n", r);
++		dev_err(adev->dev, "failed to clear page tables on GEM object close (%ld)\n",
++			r);
  	if (r || !fence)
  		goto out_unlock;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]