Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp670661ybl; Fri, 30 Aug 2019 05:33:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqwdvz1BYzsxdf5m+bA+sMhSVcpOoeIFcFe4WKnr3Fsc2GKIZDkIxMR4qRlGr5I0IDCC/p8F X-Received: by 2002:a17:902:6f10:: with SMTP id w16mr14650309plk.143.1567168412039; Fri, 30 Aug 2019 05:33:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567168412; cv=none; d=google.com; s=arc-20160816; b=T6wLCRwc3lUWwdF16Ref6+6/+eEHneq2o5UHgtoPVcfqMbfELsrlI3HNiPJTAv/LmE Y/bn91+NFc5Mfip29AJGSkEx4Y7Gub++kLlMLFcS4bVVt4G1VhSr9kNMKCzGQ85DLTEj WrTMcQ49T3WjaNcKbCwW3F+Hq6lOHjfrlosWtfVbDch7qrsqTyR+GG3OFRZKgAh2OX+7 gHwm2m4f6v6AxAiUdL+SRDS4yZsrOaUveIVcwOCcOirjqLgD3ZRPy/Wv9mjrp2Qy1D08 D6y7F5Bcqkg5m+GYiEIxZ9SrKcqr4FD9h1GJvG1nX9uRVM1G5K5TTW2dqG6SLYOoPdyz 6dNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=lK3SdEfdHzl9jiQrhuM9R9qwguoBC0l1FGo+Jyx6ye4=; b=ImUY4aTwLFwXGyYPfS3D2TqcFHFyYnGYcdSPD8GXe98l+r7jA8oi2pUBEQh2ahekRz pIqPdggzOkS/ebJ9AduuyBGV3X4Y3g/z28ly1VqjfGx4yMiaVpD3zRkNOG9jvGmFqQj9 ck2CZtUzR7AQh0tEzjTRhMb3vK2r+sy+IHBCF80/+7UlF1AzgvE2p7eywiFf3hrV3LIW ng1NT3cXGQoH4QzNbVKTELiARl/nZGskA418adCvK/WVxN8knevpuhx5pP+USDXzYxCe odNckcS/oqTmWjBLfQXxW+k4it7fex7wInNokI0Qg627gx7wB0IY+TfJIQE5uITGErwn 3YHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=mGALJXQY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k12si4590275plt.92.2019.08.30.05.33.16; Fri, 30 Aug 2019 05:33:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=mGALJXQY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727901AbfH3Ma5 (ORCPT + 99 others); Fri, 30 Aug 2019 08:30:57 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53438 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727522AbfH3Ma5 (ORCPT ); Fri, 30 Aug 2019 08:30:57 -0400 Received: by mail-wm1-f65.google.com with SMTP id 10so7117075wmp.3 for ; Fri, 30 Aug 2019 05:30:55 -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=lK3SdEfdHzl9jiQrhuM9R9qwguoBC0l1FGo+Jyx6ye4=; b=mGALJXQYufxSI9/NMXya55UCstbt+vyLc/JREg/ztiRBsbrhkFs+2GBIwHI+npCKmx 9nopyIVxmxq7feMOYn4uj7VpUvPipLTxMmuGfCgZXtlk2DdRiNLLdltVivFn6INeK+Ru EWFP1NT5G4L9YOzyONXBummjWiPklvYAsFAGV93+0zjwiLGpQzC8uTIqvIeetVDT4bs0 iwmgG+uPaZUH4oI5NmSaiS42tL1QmZ0ahpUC4uJIPdg5P8NxWeTDMTElbqMfLRXAcpZ4 hTlslfMebOGZYUa3kLbXbACr65UU4EtwpZ/0gWZQHWR384uJ5hoOGOJx9JtpegrcqjMn TRaA== 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=lK3SdEfdHzl9jiQrhuM9R9qwguoBC0l1FGo+Jyx6ye4=; b=B6I+CkhqZJublEymIkGbnOgX5e7xfn0XFFP6l3Q8Mv7WzrrDUn/lu1hNSuwZI1/RKi jjVJPRAcEbnhekyPUfYtLN0r/OdwVmc1G+te8HLF5ipEVHBuAyUKufgTbQyXPpDm8ted qY1lLKzJOh0nDutavm9Qu6Ta9uDKZeCzmDLNM+kL7yUD11bNZCEKhB3TYyOztGys/8yi 7R0khEC1WCg4UqkzrD/xrWP6IO0GL4bnCfn/ZsMIkzL5cFSa+fxF8vqBUJu7RX2TOE1Q H8baCkqlScv0j0wsNnWn3Kv6Q8MtymaSZE9j5MImoWYbjFiDYlrJG2Z45qjPQUSih3a+ gV2g== X-Gm-Message-State: APjAAAVarznYASiNp08jwAJp9ggKFzHLLvnKU7q7D2Lm3C2/ESEuMQRp RtbfUCdqp/H+BpCUI7ep8GxEFRSB6AfGqx0nZhDp X-Received: by 2002:a1c:658a:: with SMTP id z132mr18335687wmb.98.1567168254754; Fri, 30 Aug 2019 05:30:54 -0700 (PDT) MIME-Version: 1.0 References: <20190830132311.7190ccc3@canb.auug.org.au> In-Reply-To: <20190830132311.7190ccc3@canb.auug.org.au> From: Bjorn Helgaas Date: Fri, 30 Aug 2019 07:30:42 -0500 Message-ID: Subject: Re: linux-next: build failure after merge of the pci tree To: Vidya Sagar , Lorenzo Pieralisi Cc: Linux Next Mailing List , Linux Kernel Mailing List , Stephen Rothwell , Krzysztof Wilczynski Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [+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. Bjorn