From: Jonathan Corbet <corbet@lwn.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dave Airlie <airlied@linux.ie>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jani Nikula <jani.nikula@intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: linux-next: manual merge of the jc_docs tree with the drm tree
Date: Mon, 27 Jun 2016 09:48:48 -0600 [thread overview]
Message-ID: <20160627094848.3ea53331@lwn.net> (raw)
In-Reply-To: <20160627133124.4e3e8dfd@canb.auug.org.au>
On Mon, 27 Jun 2016 13:31:24 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
Sigh, I fear that index.rst could become a bit of a conflict magnet, at
least in the near future as documents are being added.
The fix is obviously correct, thanks.
jon
prev parent reply other threads:[~2016-06-27 15:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-27 3:31 linux-next: manual merge of the jc_docs tree with the drm tree Stephen Rothwell
2016-06-27 15:48 ` Jonathan Corbet [this message]
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=20160627094848.3ea53331@lwn.net \
--to=corbet@lwn.net \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).