From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Kosina Subject: Re: linux-next: manual merge of the trivial tree with the pci tree Date: Tue, 17 Nov 2009 23:19:53 +0100 (CET) Message-ID: References: <20091117155417.e0514040.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="168427776-1210159433-1258496393=:15039" Return-path: Received: from cantor.suse.de ([195.135.220.2]:56614 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756292AbZKQWTs (ORCPT ); Tue, 17 Nov 2009 17:19:48 -0500 In-Reply-To: <20091117155417.e0514040.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, =?ISO-8859-15?Q?=22Andr=E9_Goddard_Rosa=22?= , Yinghai Lu , Jesse Barnes This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --168427776-1210159433-1258496393=:15039 Content-Type: TEXT/PLAIN; charset=ISO-8859-15 Content-Transfer-Encoding: 8BIT On Tue, 17 Nov 2009, Stephen Rothwell wrote: > 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. > > 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. Thanks for letting me know. I have dropped the hunk from my queue. Jesse, could you please merge this patch to your tree instead? From: André Goddard Rosa Subject: pci: fix comment typo Signed-off-by: André Goddard Rosa Signed-off-by: Jiri Kosina 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 struct pci_root_info { --168427776-1210159433-1258496393=:15039--