[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    Re: linux-next: bad merge in the jc_docs tree
From:       Jonathan Corbet <corbet () lwn ! net>
Date:       2016-10-27 23:50:13
Message-ID: 20161027175013.234467d8 () lwn ! net
[Download RAW message or body]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]