* linux-next: manual merge of the trivial tree with the pci tree
@ 2009-11-17 4:54 Stephen Rothwell
2009-11-17 22:19 ` Jiri Kosina
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-11-17 4:54 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, "André Goddard Rosa",
Yinghai Lu, Jesse Barnes
[-- Attachment #1: Type: text/plain, Size: 592 bytes --]
Hi Jiri,
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the pci tree
2009-11-17 4:54 linux-next: manual merge of the trivial tree with the pci tree Stephen Rothwell
@ 2009-11-17 22:19 ` Jiri Kosina
2009-11-24 21:51 ` Jesse Barnes
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Kosina @ 2009-11-17 22:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, "André Goddard Rosa",
Yinghai Lu, Jesse Barnes
[-- Attachment #1: Type: TEXT/PLAIN, Size: 1313 bytes --]
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@gmail.com>
Subject: pci: fix comment typo
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
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 {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the pci tree
2009-11-17 22:19 ` Jiri Kosina
@ 2009-11-24 21:51 ` Jesse Barnes
0 siblings, 0 replies; 3+ messages in thread
From: Jesse Barnes @ 2009-11-24 21:51 UTC (permalink / raw)
To: Jiri Kosina
Cc: Stephen Rothwell, linux-next, linux-kernel,
André Goddard Rosa, Yinghai Lu
On Tue, 17 Nov 2009 23:19:53 +0100 (CET)
Jiri Kosina <jkosina@suse.cz> 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@gmail.com>
> Subject: pci: fix comment typo
>
> Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
>
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-11-24 21:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-17 4:54 linux-next: manual merge of the trivial tree with the pci tree Stephen Rothwell
2009-11-17 22:19 ` Jiri Kosina
2009-11-24 21:51 ` Jesse Barnes
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.