* linux-next: build failure after merge of the pci tree
@ 2012-09-11 1:29 Stephen Rothwell
2012-09-11 14:28 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-09-11 1:29 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Gavin Shan, linux-kernel, linux-next, Paul Mackerras,
Yijing Wang, linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 699 bytes --]
Hi Bjorn,
After merging the pci tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
arch/powerpc/platforms/powernv/pci-ioda.c: In function 'pnv_pci_window_alignment':
arch/powerpc/platforms/powernv/pci-ioda.c:1163:13: error: 'struct pci_dev' has no member named 'pcie_type'
Caused by commit ac161fbfdaa2 ("powerpc/powernv: I/O and memory alignment
for P2P bridges"). pcie_type was removed in commit b2ef39be5744 ("PCI:
Remove unused field pcie_type from struct pci_dev") (also in the pci
tree).
I have used the pci tree from next-20120910 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: build failure after merge of the pci tree
2012-09-11 1:29 linux-next: build failure after merge of the pci tree Stephen Rothwell
@ 2012-09-11 14:28 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2012-09-11 14:28 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Gavin Shan, linux-kernel, linux-next, Paul Mackerras,
Yijing Wang, linuxppc-dev
On Mon, Sep 10, 2012 at 7:29 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Bjorn,
>
> After merging the pci tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> arch/powerpc/platforms/powernv/pci-ioda.c: In function 'pnv_pci_window_alignment':
> arch/powerpc/platforms/powernv/pci-ioda.c:1163:13: error: 'struct pci_dev' has no member named 'pcie_type'
>
> Caused by commit ac161fbfdaa2 ("powerpc/powernv: I/O and memory alignment
> for P2P bridges"). pcie_type was removed in commit b2ef39be5744 ("PCI:
> Remove unused field pcie_type from struct pci_dev") (also in the pci
> tree).
>
> I have used the pci tree from next-20120910 for today.
Thanks.
Gavin, Ben, I folded in the trivial fix and updated both my
pci/gavin-window-alignment and next branches.
Ben, I think you'll need to pull in pci/jiang-pcie-cap before
pci/gavin-window-alignment to get both pieces.
Bjorn
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-11 14:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-11 1:29 linux-next: build failure after merge of the pci tree Stephen Rothwell
2012-09-11 14:28 ` Bjorn Helgaas
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).