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

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


between commit:

17defc282fe6 ("Documentation: add meta-documentation for Sphinx and kernel-doc")

from the jc_docs tree and commit:

cb597fcea5c2 ("Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl")

from the drm tree.

I fixed it up (see below - I just put them in alphabetical order ...)
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

diff --cc Documentation/index.rst
index ad07716c73f4,dacc77b43c29..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -13,8 -13,7 +13,9 @@@ Contents
.. toctree::
:maxdepth: 2

+ gpu/index
+ kernel-documentation
+ media/media_uapi

Indices and tables

 \ /
  Last update: 2016-07-11 05:21    [W:0.073 / U:1.340 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site