From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: linux-next: manual merge of the trivial tree with the pci tree Date: Tue, 24 Nov 2009 13:51:50 -0800 Message-ID: <20091124135150.0ccfd366@jbarnes-piketon> References: <20091117155417.e0514040.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from outbound-mail-137.bluehost.com ([67.222.39.27]:59899 "HELO outbound-mail-137.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S933966AbZKXVvt convert rfc822-to-8bit (ORCPT ); Tue, 24 Nov 2009 16:51:49 -0500 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Jiri Kosina Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?B?QW5kcsOp?= Goddard Rosa , Yinghai Lu On Tue, 17 Nov 2009 23:19:53 +0100 (CET) Jiri Kosina wrote: > On Tue, 17 Nov 2009, Stephen Rothwell wrote: >=20 > > Today's linux-next merge of the trivial tree got a conflict in > > arch/x86/pci/amd_bus.c between commit > > 99935a7a59eaca0292c1a5880e10bae03f4a5e3d ("x86/PCI: read root > > resources from IOH on Intel") from the pci tree and commit > > 17530b1c635dfd1f258afc6b07b986b425d66ebd ("tree-wide: fix assorted > > typos all over the place") from the trivial tree. > >=20 > > The comment fixed up by the trivial tree patch has moved to > > arch/x86/pci/bus_numa.h and I haven't bothered to fix it there. >=20 > Thanks for letting me know. >=20 > I have dropped the hunk from my queue. Jesse, could you please merge > this patch to your tree instead? >=20 >=20 >=20 >=20 > From: Andr=C3=A9 Goddard Rosa > Subject: pci: fix comment typo >=20 > Signed-off-by: Andr=C3=A9 Goddard Rosa > Signed-off-by: Jiri Kosina >=20 > diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c > index 572ee97..575f6fe 100644 > --- a/arch/x86/pci/amd_bus.c > +++ b/arch/x86/pci/amd_bus.c > @@ -19,7 +19,7 @@ > /* > * sub bus (transparent) will use entres from 3 to store extra from > root, > - * so need to make sure have enought slot there, increase > PCI_BUS_NUM_RESOURCES? > + * so need to make sure have enough slot there, increase > PCI_BUS_NUM_RESOURCES? */ > #define RES_NUM 16 =46ixed this up. The comment is in bus_numa.h now. --=20 Jesse Barnes, Intel Open Source Technology Center