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=-13.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_IN_DEF_DKIM_WL 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 32D6CC3A5A6 for ; Sat, 31 Aug 2019 14:40:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5D7121874 for ; Sat, 31 Aug 2019 14:40:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dbaOe7gs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727905AbfHaOkP (ORCPT ); Sat, 31 Aug 2019 10:40:15 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38269 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727845AbfHaOkP (ORCPT ); Sat, 31 Aug 2019 10:40:15 -0400 Received: by mail-wm1-f67.google.com with SMTP id o184so10327783wme.3 for ; Sat, 31 Aug 2019 07:40:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=lwEmp1kDTQ3Jn1SW8xtl3haIlhSExOyTeIkvr/BLe40=; b=dbaOe7gsw7vbI31moeXg5xlZY/Vw1BO2RNU6iZ0gQO8pGKzqcsvP97xwcNIAKDwUbk H+HUJDWDVwfK50rCnKvggoKRtANaHiNby2worNOZUwl7Zz8dLdxsAXCGDzPV3p23YCDK z/QgV9W/1ompNHZQ06OxWT33mmEvqOuScPpLrS4oUTzaBTDU/u5GBE+WvW8sucRviNwL qYJfQADZPN1WQLJn3yEQClJXCH8K/HU7Ow0zbxpBTOR6qiNC2JdXPR7aP8DHo76OkjAa Xu9Iz9xqakTzNmtw9PTlYZCEX70gc+RTCGJinLcVUd0zsFBdenqJnP9+v3/qYJklQ4ZU OGxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=lwEmp1kDTQ3Jn1SW8xtl3haIlhSExOyTeIkvr/BLe40=; b=Msi/VQP2LZSMmiWNRVzzZXedAh5hm7uxW4eZlc73p7dO10wIONV6HdLQQtUXPprjXg tkuZTOxqw+AIcjmWYxfli4CFof+h3ZFslE/La6HWyHVHXoX0shlWOSrof92/4/Tw4BO3 UNK14Xb+aOyi8kwftZWuk8pZany6gkW5a584A1woWkshUViYUnb/0F8nnf80OjIS7dIA 554dt21C3Lz227zcrMga6BfizRuuBYK8xunag+LEljIqzgYDgVqufznI+EliEdZB+e7R AlXCLVdBJmMHBNgwkPuYUNEYbh+q5qalphwYix0qaeJH63k3iFAu43Ukmg86jTS4wy9G jCGQ== X-Gm-Message-State: APjAAAV/xMt1oHfNOFUL2vS4h2phrl4sbnevTrD5R7+UwhhO+I8sRkzF HZyeV2nuZ3EiIpenkub3LYkMzlSbzczz0uLkZ/Hc X-Google-Smtp-Source: APXvYqyvP45u0HybFwcrSz8Ft0vPypO8L9qyYG7MxIeARKwjeEza/zNK7M/CtAUXFRDZFbLiplDynymFyQSMGZ/pT98= X-Received: by 2002:a7b:c4d5:: with SMTP id g21mr25303766wmk.149.1567262412501; Sat, 31 Aug 2019 07:40:12 -0700 (PDT) MIME-Version: 1.0 References: <20190830132311.7190ccc3@canb.auug.org.au> <9ae74244-f1e1-de7f-6d03-b2cca012f6fc@nvidia.com> <20190831084917.GA27466@e121166-lin.cambridge.arm.com> In-Reply-To: <20190831084917.GA27466@e121166-lin.cambridge.arm.com> From: Bjorn Helgaas Date: Sat, 31 Aug 2019 09:40:00 -0500 Message-ID: Subject: Re: linux-next: build failure after merge of the pci tree To: Lorenzo Pieralisi Cc: Vidya Sagar , Linux Next Mailing List , Linux Kernel Mailing List , Stephen Rothwell , Krzysztof Wilczynski Content-Type: text/plain; charset="UTF-8" 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 3:49 AM Lorenzo Pieralisi wrote: > > 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. I pulled it and updated my "next" branch, thanks!