From: Jonathan Corbet <corbet@lwn.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: bad merge in the jc_docs tree
Date: Thu, 27 Oct 2016 17:50:13 -0600 [thread overview]
Message-ID: <20161027175013.234467d8@lwn.net> (raw)
In-Reply-To: <20161028103029.1e147f3e@canb.auug.org.au>
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
prev parent reply other threads:[~2016-10-27 23:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-27 23:30 linux-next: bad merge in the jc_docs tree Stephen Rothwell
2016-10-27 23:50 ` Jonathan Corbet [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161027175013.234467d8@lwn.net \
--to=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox