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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 30 Jan 2017 13:22:39 +1100

Hi all,

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

  drivers/gpu/drm/ttm/ttm_bo.c

between commit:

  7c6d639d465e ("drm/ttm: Make sure BOs being swapped out are cacheable")

from the drm-misc-fixes tree and commit:

  bdfafc4ffdd2 ("locking/atomic, kref: Kill kref_sub()")

from the tip 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 86e3b233b722,ffc6cb55c78c..000000000000
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@@ -1669,7 -1645,7 +1645,6 @@@ static int ttm_bo_swapout(struct ttm_me
  	    container_of(shrink, struct ttm_bo_global, shrink);
  	struct ttm_buffer_object *bo;
  	int ret = -EBUSY;
- 	int put_count;
 -	uint32_t swap_placement = (TTM_PL_FLAG_CACHED | TTM_PL_FLAG_SYSTEM);
  
  	spin_lock(&glob->lru_lock);
  	list_for_each_entry(bo, &glob->swap_lru, swap) {
_______________________________________________
Intel-gfx mailing list
[email-masked]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx