Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1466587
| Path | csiph.com!feeder.erje.net!1.us.feeder.erje.net!goblin1!goblin2!goblin.stu.neva.ru!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Jonathan Corbet <corbet@lwn.net> |
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the jc_docs tree with the drm-misc tree |
| Date | Fri, 19 Aug 2016 20:00:01 +0200 |
| Message-ID | <s7Wff-e9-3@gated-at.bofh.it> (permalink) |
| References | <s7Hge-7z4-25@gated-at.bofh.it> |
| X-Original-To | Stephen Rothwell <sfr@canb.auug.org.au> |
| Organization | LWN.net |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=US-ASCII |
| Content-Transfer-Encoding | 8bit |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 25 |
| X-Original-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> |
| X-Original-Date | Fri, 19 Aug 2016 11:50:09 -0600 |
| X-Original-Message-ID | <20160819115009.354453a6@lwn.net> |
| X-Original-References | <20160819115215.6585dc3a@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1466587 |
Show key headers only | View raw
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the jc_docs tree with the drm-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-08-19 04:00 +0200
Re: linux-next: manual merge of the jc_docs tree with the drm-misc tree Jonathan Corbet <corbet@lwn.net> - 2016-08-19 20:00 +0200
Re: linux-next: manual merge of the jc_docs tree with the drm-misc tree Daniel Vetter <daniel@ffwll.ch> - 2016-08-22 09:00 +0200
csiph-web