On Mon, 27 Jun 2016 13:31:24 +1000
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> Documentation/index.rst
>
> between commit:
>
> cb597fcea5c2 ("Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl")
>
> from the drm tree and commit:
>
> 17defc282fe6 ("Documentation: add meta-documentation for Sphinx and kernel-doc")
>
> from the jc_docs tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Sigh, I fear that index.rst could become a bit of a conflict magnet, at
least in the near future as documents are being added.
The fix is obviously correct, thanks.
jon
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
