From: Jonathan Corbet <corbet@lwn.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Markus Heiser <markus.heiser@darmarIT.de>
Subject: Re: linux-next: manual merge of the jc_docs tree with the drm-misc tree
Date: Fri, 19 Aug 2016 11:50:09 -0600 [thread overview]
Message-ID: <20160819115009.354453a6@lwn.net> (raw)
In-Reply-To: <20160819115215.6585dc3a@canb.auug.org.au>
On Fri, 19 Aug 2016 11:52:15 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> Documentation/gpu/index.rst
>
> between commit:
>
> b754b35b089d ("vgaarbiter: rst-ifiy and polish kerneldoc")
>
> from the drm-misc tree and commit:
>
> 505f711174b0 ("doc-rst: add index to sub-folders")
>
> from the jc_docs tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, the fix is good.
Daniel: my apologies, I should have asked for that patch to be split up
and the relevant pieces sent through the gpu and media trees.
jon
next prev parent reply other threads:[~2016-08-19 17:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-19 1:52 linux-next: manual merge of the jc_docs tree with the drm-misc tree Stephen Rothwell
2016-08-19 17:50 ` Jonathan Corbet [this message]
2016-08-22 6:56 ` Daniel Vetter
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=20160819115009.354453a6@lwn.net \
--to=corbet@lwn.net \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=markus.heiser@darmarIT.de \
--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