Re: linux-next: bad merge in the jc_docs tree

2016-10-27 Thread Jonathan Corbet
On Fri, 28 Oct 2016 10:30:29 +1100 Stephen Rothwell 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 pus

linux-next: bad merge in the jc_docs tree

2016-10-27 Thread Stephen Rothwell
Hi Jon, 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") -- Cheers, Stephen Rothwell