Hi all,
After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:
arch/sparc/kernel/pci.c: In function 'pci_scan_one_pbm':
arch/sparc/kernel/pci.c:689:21: error: 'struct pci_pbm_info' has no member named 'pci_last_busn'
Caused by commit 2c7f691b032b ("sparc/PCI: register busn_res for root buses").
I have added the following patch for today:
From: Stephen Rothwell <[email protected]>
Date: Tue, 12 Jun 2012 14:48:39 +1000
Subject: [PATCH] sparc/PCI: fix typo
Signed-off-by: Stephen Rothwell <[email protected]>
---
arch/sparc/kernel/pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 74e4bf3..4f92a9a 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -686,7 +686,7 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,
pci_add_resource_offset(&resources, &pbm->mem_space,
pbm->mem_space.start);
pbm->busn.start = pbm->pci_first_busno;
- pbm->busn.end = pbm->pci_last_busn;
+ pbm->busn.end = pbm->pci_last_busno;
pbm->busn.flags = IORESOURCE_BUS;
pci_add_resource(&resources, &pbm->busn);
bus = pci_create_root_bus(parent, pbm->pci_first_busno, pbm->pci_ops,
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell [email protected]
On Mon, Jun 11, 2012 at 10:54 PM, Stephen Rothwell <[email protected]> wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
>
> arch/sparc/kernel/pci.c: In function 'pci_scan_one_pbm':
> arch/sparc/kernel/pci.c:689:21: error: 'struct pci_pbm_info' has no member named 'pci_last_busn'
>
> Caused by commit 2c7f691b032b ("sparc/PCI: register busn_res for root buses").
>
> I have added the following patch for today:
>
> From: Stephen Rothwell <[email protected]>
> Date: Tue, 12 Jun 2012 14:48:39 +1000
> Subject: [PATCH] sparc/PCI: fix typo
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> ?arch/sparc/kernel/pci.c | ? ?2 +-
> ?1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
> index 74e4bf3..4f92a9a 100644
> --- a/arch/sparc/kernel/pci.c
> +++ b/arch/sparc/kernel/pci.c
> @@ -686,7 +686,7 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,
> ? ? ? ?pci_add_resource_offset(&resources, &pbm->mem_space,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?pbm->mem_space.start);
> ? ? ? ?pbm->busn.start = pbm->pci_first_busno;
> - ? ? ? pbm->busn.end ? = pbm->pci_last_busn;
> + ? ? ? pbm->busn.end ? = pbm->pci_last_busno;
> ? ? ? ?pbm->busn.flags = IORESOURCE_BUS;
> ? ? ? ?pci_add_resource(&resources, &pbm->busn);
> ? ? ? ?bus = pci_create_root_bus(parent, pbm->pci_first_busno, pbm->pci_ops,
Thanks, I folded this typo fix into the relevant patch. I'll rebase
"next" today. Sorry for the trouble.
Bjorn
Hi Bjorn,
On Tue, 12 Jun 2012 09:31:49 -0600 Bjorn Helgaas <[email protected]> wrote:
>
> Thanks, I folded this typo fix into the relevant patch. I'll rebase
> "next" today. Sorry for the trouble.
I am not sure what you have done, but now you have a set of duplicated
commits in your tree including both versions of the one that caused the
build failure.
--
Cheers,
Stephen Rothwell [email protected]
On Tue, Jun 12, 2012 at 6:50 PM, Stephen Rothwell <[email protected]> wrote:
> Hi Bjorn,
>
> On Tue, 12 Jun 2012 09:31:49 -0600 Bjorn Helgaas <[email protected]> wrote:
>>
>> Thanks, I folded this typo fix into the relevant patch. ?I'll rebase
>> "next" today. ?Sorry for the trouble.
>
> I am not sure what you have done, but now you have a set of duplicated
> commits in your tree including both versions of the one that caused the
> build failure.
This is because of my inept git usage. I think my "next" branch ended
up with the right bits in it, but the history looked strange because I
fixed the typo in the Yinghai branch, but had a second branch that
depended on the original unfixed branch.
I rebuilt my "next" branch again and I think it's more
straightforward. And I learned a tiny bit more about git, so thanks
for pointing this out.
Bjorn