From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Airlie <airlied@linux•ie>, Jonathan Corbet <corbet@lwn•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jani Nikula <jani.nikula@intel•com>,
Daniel Vetter <daniel.vetter@ffwll•ch>
Subject: linux-next: manual merge of the drm tree with the jc_docs tree
Date: Mon, 11 Jul 2016 12:32:35 +1000 [thread overview]
Message-ID: <20160711123235.39cf9e31@canb.auug.org.au> (raw)
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
Documentation/index.rst
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.
--
Cheers,
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
==================
next reply other threads:[~2016-07-11 2:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-11 2:32 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-12-12 0:57 linux-next: manual merge of the drm tree with the jc_docs tree Stephen Rothwell
2019-06-24 3:41 Stephen Rothwell
2019-07-08 23:54 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160711123235.39cf9e31@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=corbet@lwn$(echo .)net \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=jani.nikula@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox