On Mon, 27 Jun 2016 13:31:24 +1000
Stephen Rothwell 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
Hi Jonathan,
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 fo
2 matches
Mail list logo