* linux-next: bad merge in the jc_docs tree
@ 2016-10-27 23:30 Stephen Rothwell
2016-10-27 23:50 ` Jonathan Corbet
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2016-10-27 23:30 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: linux-next, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: bad merge in the jc_docs tree
2016-10-27 23:30 linux-next: bad merge in the jc_docs tree Stephen Rothwell
@ 2016-10-27 23:50 ` Jonathan Corbet
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Corbet @ 2016-10-27 23:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On Fri, 28 Oct 2016 10:30:29 +1100
Stephen Rothwell <sfr@canb.auug.org.au> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-27 23:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-27 23:30 linux-next: bad merge in the jc_docs tree Stephen Rothwell
2016-10-27 23:50 ` Jonathan Corbet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox