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

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/vmwgfx/ttm_object.h

between commit:

  a309c7194e8a ("drm/vmwgfx: Remove rcu locks from user resources")

from Linus' tree and commit:

  13acb368bf02 ("drm/ttm/vmwgfx: move ttm_bo_wait into VMWGFX")

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/ttm_object.h
index 8098a3846bae,95a9679f9d39..000000000000
--- a/drivers/gpu/drm/vmwgfx/ttm_object.h
+++ b/drivers/gpu/drm/vmwgfx/ttm_object.h
@@@ -307,4 -309,27 +309,12 @@@ extern int ttm_prime_handle_to_fd(struc
  #define ttm_prime_object_kfree(__obj, __prime)		\
  	kfree_rcu(__obj, __prime.base.rhead)
  
 -struct ttm_base_object *
 -ttm_base_object_noref_lookup(struct ttm_object_file *tfile, uint64_t key);
 -
 -/**
 - * ttm_base_object_noref_release - release a base object pointer looked up
 - * without reference
 - *
 - * Releases a base object pointer looked up with ttm_base_object_noref_lookup().
 - */
 -static inline void ttm_base_object_noref_release(void)
 -{
 -	__acquire(RCU);
 -	rcu_read_unlock();
 -}
 -
+ static inline int ttm_bo_wait(struct ttm_buffer_object *bo, bool intr,
+ 			      bool no_wait)
+ {
+ 	struct ttm_operation_ctx ctx = { intr, no_wait };
+ 
+ 	return ttm_bo_wait_ctx(bo, &ctx);
+ }
+ 
  #endif

Attachment: pgpRIwEGU4SxF.pgp
Description: OpenPGP digital signature