linux-next: manual merge of the drm tree with the jc_docs tree
From: Stephen Rothwell
Date: Sun Dec 11 2016 - 19:58:02 EST
Today's linux-next merge of the drm tree got a conflict in:
3080b056b3d4 ("docs/driver-api: Apply changed source file names")
868c97a846a7 ("dma-buf: Extract dma-buf.rst")
from the jc_docs tree and commit:
8a5846bf5d47 ("doc/dma-buf: Fix up include directives")
from the drm tree.
I fixed it up (the text modified by the latter was also modified by
commit 3080b056b3d4, then 868c97a846a7 moved it all to another file) 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.