On Fri, 19 Aug 2016 11:52:15 +1000
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
