From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: Re: linux-next: build failure after merge of the pci tree Date: Tue, 11 Sep 2012 08:28:39 -0600 Message-ID: References: <20120911112924.c2206bc738a2c29259f6e2d8@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: Received: from mail-lb0-f174.google.com ([209.85.217.174]:48851 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755251Ab2IKO3B (ORCPT ); Tue, 11 Sep 2012 10:29:01 -0400 Received: by lbbgj3 with SMTP id gj3so407280lbb.19 for ; Tue, 11 Sep 2012 07:28:59 -0700 (PDT) In-Reply-To: <20120911112924.c2206bc738a2c29259f6e2d8@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Gavin Shan , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org, Yijing Wang On Mon, Sep 10, 2012 at 7:29 PM, Stephen Rothwell 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