On Fri, 28 Oct 2016 10:30:29 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> I noticed that you left some conflict markers in
> Documentation/admin-guide/index.rst in merge commit
>
> 7a6992dc952e ("Merge branch 'doc-tweaks' into docs-next")
Argh. I noticed that too, but failed to amend the merge before pushing.
Thanks for the heads-up.
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
