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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 7 Aug 2019 13:09:33 +1000

Hi all,

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

  drivers/gpu/drm/ttm/ttm_bo.c

between commit:

  274840e54422 ("drm/ttm: Add release_notify callback to ttm_bo_driver")

from the amdgpu tree and commit:

  b96f3e7c8069 ("drm/ttm: use gem vma_node")

from the drm-misc 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/ttm/ttm_bo.c
index 2070e8a57ed8,10a861a1690c..000000000000
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@@ -671,10 -672,7 +672,10 @@@ static void ttm_bo_release(struct kref 
  	struct ttm_bo_device *bdev = bo->bdev;
  	struct ttm_mem_type_manager *man = &bdev->man[bo->mem.mem_type];
  
 +	if (bo->bdev->driver->release_notify)
 +		bo->bdev->driver->release_notify(bo);
 +
- 	drm_vma_offset_remove(&bdev->vma_manager, &bo->vma_node);
+ 	drm_vma_offset_remove(&bdev->vma_manager, &bo->base.vma_node);
  	ttm_mem_io_lock(man, false);
  	ttm_mem_io_free_vm(bo);
  	ttm_mem_io_unlock(man);