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

On Fri, Aug 19, 2016 at 11:50:09AM -0600, Jonathan Corbet wrote: > On Fri, 19 Aug 2016 11:52:15 +1000 > Stephen Rothwell wrote: > > > Today's linux-next merge of the jc_docs tree got a conflict in: > > > > Documentation/gpu/index.rst > > > > between commit: > > > > b754b35b089d ("vgaarbite

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

On Fri, 19 Aug 2016 11:52:15 +1000 Stephen Rothwell 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: > > 505