Subject: linux-next: manual merge of the drm tree with the v4l-dvb tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 19 Jul 2016 11:21:37 +1000

Hi Dave,

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

  Documentation/index.rst

between commits:

  d26a5d4350fd ("[media] doc-rst: Convert media API to rst")
  651af5e464ec ("[media] add DVB documentation to Sphinx")

from the v4l-dvb 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) 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 Documentation/index.rst
index 31273cc2e0bc,dacc77b43c29..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -13,11 -13,7 +13,12 @@@ Contents
  .. toctree::
     :maxdepth: 2
  
+    gpu/index
 +   kernel-documentation
 +   media/media_uapi
 +   media/media_drivers
 +   media/dvb-drivers/index
 +   media/v4l-drivers/index
  
  Indices and tables
  ==================