2019-08-30 03:24:27

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the pci tree

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 <linux/pci-aspm.h>
| ^~~~~~~~~~~~~~~~~~

Caused by commit

81564976b1a9 ("PCI: tegra: Add Tegra194 PCIe support")

I have reverted that commit for todat.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2019-08-30 12:33:32

by Bjorn Helgaas

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the pci tree

[+cc Krzysztof]

On Thu, Aug 29, 2019 at 10:23 PM Stephen Rothwell <[email protected]> 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 <linux/pci-aspm.h>
> | ^~~~~~~~~~~~~~~~~~
>
> 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

2019-08-31 04:31:52

by Vidya Sagar

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the pci tree

On 8/30/2019 6:00 PM, Bjorn Helgaas wrote:
> [+cc Krzysztof]
>
> On Thu, Aug 29, 2019 at 10:23 PM Stephen Rothwell <[email protected]> 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 <linux/pci-aspm.h>
>> | ^~~~~~~~~~~~~~~~~~
>>
>> 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?

>
> Bjorn
>

2019-08-31 08:50:32

by Lorenzo Pieralisi

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the pci tree

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 <[email protected]> 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 <linux/pci-aspm.h>
> > > | ^~~~~~~~~~~~~~~~~~
> > >
> > > 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

2019-08-31 14:42:07

by Bjorn Helgaas

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the pci tree

On Sat, Aug 31, 2019 at 3:49 AM Lorenzo Pieralisi
<[email protected]> 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 <[email protected]> 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 <linux/pci-aspm.h>
> > > > | ^~~~~~~~~~~~~~~~~~
> > > >
> > > > 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!

2019-08-31 16:51:51

by Vidya Sagar

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the pci tree

On 8/31/2019 2:19 PM, 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 <[email protected]> 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 <linux/pci-aspm.h>
>>>> | ^~~~~~~~~~~~~~~~~~
>>>>
>>>> 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.
Thanks a lot Lorenzo and Bjorn.

- Vidya Sagar
>
> Lorenzo
>