From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942858AbcJ0XuT (ORCPT ); Thu, 27 Oct 2016 19:50:19 -0400 Received: from tex.lwn.net ([70.33.254.29]:41395 "EHLO vena.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937770AbcJ0XuR (ORCPT ); Thu, 27 Oct 2016 19:50:17 -0400 Date: Thu, 27 Oct 2016 17:50:13 -0600 From: Jonathan Corbet To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: bad merge in the jc_docs tree Message-ID: <20161027175013.234467d8@lwn.net> In-Reply-To: <20161028103029.1e147f3e@canb.auug.org.au> References: <20161028103029.1e147f3e@canb.auug.org.au> Organization: LWN.net X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 pushing. Thanks for the heads-up. jon