Re: linux-next: bad merge in the jc_docs tree
From: Jonathan Corbet <corbet@lwn.net>
Date: 2016-10-27 23:50:19
Also in:
lkml
On Fri, 28 Oct 2016 10:30:29 +1100 Stephen Rothwell [off-list ref] 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