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

[Stephen Rothwell]

Hi all,

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

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

between commit:

  5e791166d377 ("drm/ttm: nuke invalidate_caches callback")

from the drm tree and commit:

  58e6933fa53e ("drm/amdgpu/ttm: move debugfs init into core amdgpu debugfs")

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_ttm.c
index 3ab46d4647e4,660867cf2597..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -66,9 -68,11 +68,6 @@@ static int amdgpu_map_buffer(struct ttm
  			     struct amdgpu_ring *ring,
  			     uint64_t *addr);
  
- static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev);
- static void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev);
 -static int amdgpu_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)
 -{
 -	return 0;
 -}
--
  /**
   * amdgpu_init_mem_type - Initialize a memory manager for a specific type of
   * memory request.

Attachment: pgpJgsU9xzzVA.pgp
Description: OpenPGP digital signature