linux-next: manual merge of the tip tree with the drm tree
From: Stephen Rothwell
Date: Thu Feb 16 2017 - 20:56:42 EST
Today's linux-next merge of the tip tree got a conflict in:
56e3d1cd05cc ("kref: prefer atomic_inc_not_zero to atomic_add_unless")
from the drm tree and commit:
10383aea2f44 ("kref: Implement 'struct kref' using refcount_t")
from the tip tree.
I fixed it up (I just used the tip tree version of kref_get_unless_zero())
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.