Re: linux-next: manual merge of the jc_docs tree with the drm-misc tree

From	Daniel Vetter <daniel@ffwll.ch>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the jc_docs tree with the drm-misc tree
Date	2016-08-22 09:00 +0200
Message-ID	<s8Rnc-2P6-29@gated-at.bofh.it> (permalink)
References	<s7Hge-7z4-25@gated-at.bofh.it> <s7Wff-e9-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Fri, Aug 19, 2016 at 11:50:09AM -0600, Jonathan Corbet wrote:
> 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.

No worries, as far as conflicts go this one is trivial ;-) And I think a
few conflicts while we shake out best practices for the new doc
infrastructure in various trees is perfectly fine.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

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