From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754922Ab2FMXVM (ORCPT ); Wed, 13 Jun 2012 19:21:12 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:61445 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754836Ab2FMXVK convert rfc822-to-8bit (ORCPT ); Wed, 13 Jun 2012 19:21:10 -0400 MIME-Version: 1.0 In-Reply-To: <20120613105041.2d5dcdde6b9cf3dcfba3885d@canb.auug.org.au> References: <20120612145441.400975347f06785d391d0f8f@canb.auug.org.au> <20120613105041.2d5dcdde6b9cf3dcfba3885d@canb.auug.org.au> From: Bjorn Helgaas Date: Wed, 13 Jun 2012 17:20:46 -0600 Message-ID: Subject: Re: linux-next: build failure after merge of the final tree (pci tree related) To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu , "David S. Miller" , sparclinux@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 12, 2012 at 6:50 PM, Stephen Rothwell wrote: > Hi Bjorn, > > On Tue, 12 Jun 2012 09:31:49 -0600 Bjorn Helgaas wrote: >> >> Thanks, I folded this typo fix into the relevant patch.  I'll rebase >> "next" today.  Sorry for the trouble. > > I am not sure what you have done, but now you have a set of duplicated > commits in your tree including both versions of the one that caused the > build failure. This is because of my inept git usage. I think my "next" branch ended up with the right bits in it, but the history looked strange because I fixed the typo in the Yinghai branch, but had a second branch that depended on the original unfixed branch. I rebuilt my "next" branch again and I think it's more straightforward. And I learned a tiny bit more about git, so thanks for pointing this out. Bjorn From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Date: Wed, 13 Jun 2012 23:20:46 +0000 Subject: Re: linux-next: build failure after merge of the final tree (pci tree related) Message-Id: List-Id: References: <20120612145441.400975347f06785d391d0f8f@canb.auug.org.au> <20120613105041.2d5dcdde6b9cf3dcfba3885d@canb.auug.org.au> In-Reply-To: <20120613105041.2d5dcdde6b9cf3dcfba3885d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu , "David S. Miller" , sparclinux@vger.kernel.org On Tue, Jun 12, 2012 at 6:50 PM, Stephen Rothwell wr= ote: > Hi Bjorn, > > On Tue, 12 Jun 2012 09:31:49 -0600 Bjorn Helgaas wr= ote: >> >> Thanks, I folded this typo fix into the relevant patch. =A0I'll rebase >> "next" today. =A0Sorry for the trouble. > > I am not sure what you have done, but now you have a set of duplicated > commits in your tree including both versions of the one that caused the > build failure. This is because of my inept git usage. I think my "next" branch ended up with the right bits in it, but the history looked strange because I fixed the typo in the Yinghai branch, but had a second branch that depended on the original unfixed branch. I rebuilt my "next" branch again and I think it's more straightforward. And I learned a tiny bit more about git, so thanks for pointing this out. Bjorn