From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2548EC3A59F for ; Sat, 31 Aug 2019 08:49:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F198B23711 for ; Sat, 31 Aug 2019 08:49:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726360AbfHaItZ (ORCPT ); Sat, 31 Aug 2019 04:49:25 -0400 Received: from foss.arm.com ([217.140.110.172]:39376 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726029AbfHaItZ (ORCPT ); Sat, 31 Aug 2019 04:49:25 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6C85128; Sat, 31 Aug 2019 01:49:24 -0700 (PDT) Received: from e121166-lin.cambridge.arm.com (unknown [10.1.196.255]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 82FA53F59C; Sat, 31 Aug 2019 01:49:23 -0700 (PDT) Date: Sat, 31 Aug 2019 09:49:17 +0100 From: Lorenzo Pieralisi To: Vidya Sagar Cc: Bjorn Helgaas , Linux Next Mailing List , Linux Kernel Mailing List , Stephen Rothwell , Krzysztof Wilczynski Subject: Re: linux-next: build failure after merge of the pci tree Message-ID: <20190831084917.GA27466@e121166-lin.cambridge.arm.com> References: <20190830132311.7190ccc3@canb.auug.org.au> <9ae74244-f1e1-de7f-6d03-b2cca012f6fc@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9ae74244-f1e1-de7f-6d03-b2cca012f6fc@nvidia.com> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Sat, Aug 31, 2019 at 09:51:05AM +0530, Vidya Sagar wrote: > On 8/30/2019 6:00 PM, Bjorn Helgaas wrote: > > [+cc Krzysztof] > > > > On Thu, Aug 29, 2019 at 10:23 PM Stephen Rothwell wrote: > > > > > > Hi all, > > > > > > After merging the pci tree, today's linux-next build (x86_64 allmodconfig) > > > failed like this: > > > > > > drivers/pci/controller/dwc/pcie-tegra194.c:24:10: fatal error: linux/pci-aspm.h: No such file or directory > > > 24 | #include > > > | ^~~~~~~~~~~~~~~~~~ > > > > > > Caused by commit > > > > > > 81564976b1a9 ("PCI: tegra: Add Tegra194 PCIe support") > > > > > > I have reverted that commit for todat. > > > > Thanks, Stephen. > > > > I *could* fix this by removing that include in the merge, since the > > contents of linux/pci-aspm.h were moved into linux/pci.h by > > https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?id=7ce2e76a0420 > > > > But as far as I can tell, pcie-tegra194.c doesn't actually require > > anything from linux/pci-aspm.h, so I'd rather amend the tegra194 > > commit https://git.kernel.org/cgit/linux/kernel/git/lpieralisi/pci.git/commit/?id=81564976b1a9 > > so it doesn't include pci-aspm.h in the first place. > Thanks Bjorn for the reply. > Yes. This header file is not required for now and can be removed. > Is there any action required from my side for this? I updated my pci/tegra branch so that Bjorn can pull it. Lorenzo