Re: linux-next: manual merge of the trivial tree with the pci tree

[Jesse Barnes]

On Tue, 17 Nov 2009 23:19:53 +0100 (CET)
Jiri Kosina <jkosina@xxxxxxx> wrote:

> 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 <andre.goddard@xxxxxxxxx>
> Subject: pci: fix comment typo
> 
> Signed-off-by: Andrà Goddard Rosa <andre.goddard@xxxxxxxxx>
> Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
> 
> 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

Fixed this up.  The comment is in bus_numa.h now.

-- 
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/