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

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

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

Hi all,

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

  drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

between commit:

  a0a63940b0c9 ("drm/vmwgfx: Assign eviction priorities to resources")

from the drm tree and commit:

  52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv")

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/vmwgfx/vmwgfx_resource.c
index 2eb3532e3291,0b5472450633..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@@ -33,36 -34,6 +33,36 @@@
  
  #define VMW_RES_EVICT_ERR_COUNT 10
  
 +/**
 + * vmw_resource_mob_attach - Mark a resource as attached to its backing mob
 + * @res: The resource
 + */
 +void vmw_resource_mob_attach(struct vmw_resource *res)
 +{
 +	struct vmw_buffer_object *backup = res->backup;
 +
- 	reservation_object_assert_held(backup->base.base.resv);
++	dma_resv_assert_held(backup->base.base.resv);
 +	res->used_prio = (res->res_dirty) ? res->func->dirty_prio :
 +		res->func->prio;
 +	list_add_tail(&res->mob_head, &backup->res_list);
 +	vmw_bo_prio_add(backup, res->used_prio);
 +}
 +
 +/**
 + * vmw_resource_mob_detach - Mark a resource as detached from its backing mob
 + * @res: The resource
 + */
 +void vmw_resource_mob_detach(struct vmw_resource *res)
 +{
 +	struct vmw_buffer_object *backup = res->backup;
 +
- 	reservation_object_assert_held(backup->base.base.resv);
++	dma_resv_assert_held(backup->base.base.resv);
 +	if (vmw_resource_mob_attached(res)) {
 +		list_del_init(&res->mob_head);
 +		vmw_bo_prio_del(backup, res->used_prio);
 +	}
 +}
 +
  struct vmw_resource *vmw_resource_reference(struct vmw_resource *res)
  {
  	kref_get(&res->kref);

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