[lkml]   [2016]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the drm tree with Linus' tree
Hi Dave,

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


between commit:

56fc350224f1 ("drm/ttm: fix kref count mess in ttm_bo_move_to_lru_tail")

from Linus' tree and commits:

c3ea576e0583 ("drm/ttm: add optional LRU removal callback v2")
98c2872ae99b ("drm/ttm: implement LRU add callbacks v2")

from the drm tree.

I fixed it up (I have no idea how to fix merge these changes, so I just
used the latter ones) 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.

Stephen Rothwell

 \ /
  Last update: 2016-05-09 03:41    [W:0.017 / U:0.396 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site