From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Corbet <corbet@lwn•net>, Dave Airlie <airlied@linux•ie>
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 jc_docs tree with the drm tree
Date: Mon, 27 Jun 2016 13:31:24 +1000 [thread overview]
Message-ID: <20160627133124.4e3e8dfd@canb.auug.org.au> (raw)
Hi Jonathan,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/index.rst
between commit:
cb597fcea5c2 ("Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl")
from the drm tree and commit:
17defc282fe6 ("Documentation: add meta-documentation for Sphinx and kernel-doc")
from the jc_docs 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 dacc77b43c29,f92854f01773..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -13,8 -13,8 +13,10 @@@ Contents
.. toctree::
:maxdepth: 2
+ kernel-documentation
+
+ gpu/index
+
Indices and tables
==================
next reply other threads:[~2016-06-27 3:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-27 3:31 Stephen Rothwell [this message]
2016-06-27 15:48 ` linux-next: manual merge of the jc_docs tree with the drm tree Jonathan Corbet
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=20160627133124.4e3e8dfd@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