* [PATCH] tilegx pci: fix semantic merge conflict with 3527ed81c
@ 2012-07-25 19:40 Chris Metcalf
2012-07-25 21:16 ` Bjorn Helgaas
0 siblings, 1 reply; 3+ messages in thread
From: Chris Metcalf @ 2012-07-25 19:40 UTC (permalink / raw)
To: linux-pci, linux-kernel, Bjorn Helgaas, Yinghai Lu
Yinghai Lu removed pci_bus.subordinate in pci-next, which meant that
the tile-next changes to add tilegx PCI support don't build. This
was expected (seen in linux-next) and this one-line fix is along
the same lines as commit b918c62e for all other architectures.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
---
arch/tile/kernel/pci_gx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index fa75264..0e213e3 100644
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -853,7 +853,7 @@ int __init pcibios_init(void)
bus = pci_scan_root_bus(NULL, next_busno, controller->ops,
controller, &resources);
controller->root_bus = bus;
- next_busno = bus->subordinate + 1;
+ next_busno = bus->busn_res.end + 1;
}
--
1.7.10.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] tilegx pci: fix semantic merge conflict with 3527ed81c
2012-07-25 19:40 [PATCH] tilegx pci: fix semantic merge conflict with 3527ed81c Chris Metcalf
@ 2012-07-25 21:16 ` Bjorn Helgaas
2012-07-25 22:45 ` Chris Metcalf
0 siblings, 1 reply; 3+ messages in thread
From: Bjorn Helgaas @ 2012-07-25 21:16 UTC (permalink / raw)
To: Chris Metcalf; +Cc: linux-pci, linux-kernel, Yinghai Lu
On Wed, Jul 25, 2012 at 1:40 PM, Chris Metcalf <cmetcalf@tilera.com> wrote:
> Yinghai Lu removed pci_bus.subordinate in pci-next, which meant that
> the tile-next changes to add tilegx PCI support don't build. This
> was expected (seen in linux-next) and this one-line fix is along
> the same lines as commit b918c62e for all other architectures.
>
> Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
You pushed the other tile changes, so I assume you'll do the same with
this one. But let me know if you want me to push it to Linus.
> ---
> arch/tile/kernel/pci_gx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
> index fa75264..0e213e3 100644
> --- a/arch/tile/kernel/pci_gx.c
> +++ b/arch/tile/kernel/pci_gx.c
> @@ -853,7 +853,7 @@ int __init pcibios_init(void)
> bus = pci_scan_root_bus(NULL, next_busno, controller->ops,
> controller, &resources);
> controller->root_bus = bus;
> - next_busno = bus->subordinate + 1;
> + next_busno = bus->busn_res.end + 1;
>
> }
>
> --
> 1.7.10.3
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] tilegx pci: fix semantic merge conflict with 3527ed81c
2012-07-25 21:16 ` Bjorn Helgaas
@ 2012-07-25 22:45 ` Chris Metcalf
0 siblings, 0 replies; 3+ messages in thread
From: Chris Metcalf @ 2012-07-25 22:45 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-pci, linux-kernel, Yinghai Lu
On 7/25/2012 5:16 PM, Bjorn Helgaas wrote:
> On Wed, Jul 25, 2012 at 1:40 PM, Chris Metcalf <cmetcalf@tilera.com> wrote:
>> > Yinghai Lu removed pci_bus.subordinate in pci-next, which meant that
>> > the tile-next changes to add tilegx PCI support don't build. This
>> > was expected (seen in linux-next) and this one-line fix is along
>> > the same lines as commit b918c62e for all other architectures.
>> >
>> > Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
>
> You pushed the other tile changes, so I assume you'll do the same with
> this one.
I will, thanks!
--
Chris Metcalf, Tilera Corp.
http://www.tilera.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-25 22:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-25 19:40 [PATCH] tilegx pci: fix semantic merge conflict with 3527ed81c Chris Metcalf
2012-07-25 21:16 ` Bjorn Helgaas
2012-07-25 22:45 ` Chris Metcalf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).