From: Kishon Vijay Abraham I <kishon@ti.com>
To: Niklas Cassel <niklas.cassel@axis.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Bjorn Helgaas <bhelgaas@google.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Cyrille Pitchen <cyrille.pitchen@free-electrons.com>
Subject: Re: linux-next: build failure after merge of the pci tree
Date: Thu, 1 Feb 2018 16:52:01 +0530 [thread overview]
Message-ID: <30c8c87f-bba9-d71e-b8d5-4b547711bab2@ti.com> (raw)
In-Reply-To: <20180201111617.GA8396@axis.com>
Hi Niklas,
On Thursday 01 February 2018 04:46 PM, Niklas Cassel wrote:
> On Thu, Feb 01, 2018 at 11:10:54AM +0000, Lorenzo Pieralisi wrote:
>> On Thu, Feb 01, 2018 at 09:56:09AM +0100, Niklas Cassel wrote:
>>> On Thu, Feb 01, 2018 at 10:51:14AM +1100, Stephen Rothwell wrote:
>>>> Hi Bjorn,
>>>>
>>>> After merging the pci tree, today's linux-next build (arm
>>>> multi_v7_defconfig) failed like this:
>>>>
>>>> drivers/pci/dwc/pcie-designware-ep.c: In function 'dw_pcie_ep_raise_msi_irq':
>>>> drivers/pci/dwc/pcie-designware-ep.c:293:8: error: too few arguments to function 'dw_pcie_ep_map_addr'
>>>> ret = dw_pcie_ep_map_addr(epc, ep->msi_mem_phys, msg_addr,
>>>> ^~~~~~~~~~~~~~~~~~~
>>>> drivers/pci/dwc/pcie-designware-ep.c:177:12: note: declared here
>>>> static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,
>>>> ^~~~~~~~~~~~~~~~~~~
>>>> drivers/pci/dwc/pcie-designware-ep.c:300:2: error: too few arguments to function 'dw_pcie_ep_unmap_addr'
>>>> dw_pcie_ep_unmap_addr(epc, ep->msi_mem_phys);
>>>> ^~~~~~~~~~~~~~~~~~~~~
>>>> drivers/pci/dwc/pcie-designware-ep.c:161:13: note: declared here
>>>> static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no,
>>>> ^~~~~~~~~~~~~~~~~~~~~
>>>>
>>>> Caused by commit
>>>>
>>>> 4494738de0d9 ("PCI: endpoint: Add the function number as argument to EPC ops")
>>>>
>>>> interacting with commit
>>>>
>>>> 6f6d7873711c ("PCI: designware-ep: Add generic function for raising MSI irq")
>>>>
>>>> This should have been fixed up in commit
>>>>
>>>> 26b259ab4fe8 ("Merge remote-tracking branch 'lorenzo/pci/dwc' into next")
>>>>
>>>> I have used the pci tree from next-20180131 for today.
>>>
>>> Hello,
>>>
>>> A suggested merge resolution included as an attachment.
>>
>> The resolution is OK to me - we have not spotted it since
>> PCI_ENDPOINT is being turned on in the config file in question only
>> in -next, it is not on by default in current mainline, apologies.
>>
>> Lorenzo
>
> Adding Kishon to CC, he should probably have a look.
>
> https://marc.info/?l=linux-kernel&m=151747537928327&w=2
>
> If Kishon approves the suggested merge resolution,
> perhaps it can be squashed with Cyrille's patch.
The patch looks good to me.
Thanks
Kishon
next prev parent reply other threads:[~2018-02-01 11:22 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-31 23:51 linux-next: build failure after merge of the pci tree Stephen Rothwell
2018-02-01 8:56 ` Niklas Cassel
2018-02-01 11:10 ` Lorenzo Pieralisi
2018-02-01 11:16 ` Niklas Cassel
2018-02-01 11:22 ` Kishon Vijay Abraham I [this message]
2018-02-01 11:29 ` Niklas Cassel
2018-02-01 19:00 ` Bjorn Helgaas
2018-02-01 21:13 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-10-24 5:14 Stephen Rothwell
2023-10-24 11:01 ` Ilpo Järvinen
2023-10-23 0:05 Stephen Rothwell
2023-10-23 7:30 ` Yoshihiro Shimoda
2023-10-23 7:34 ` Krzysztof Wilczyński
2023-10-23 9:36 ` Yoshihiro Shimoda
2023-10-23 12:56 ` Krzysztof Wilczyński
2023-10-06 0:56 Stephen Rothwell
2023-10-06 1:23 ` Mario Limonciello
2023-10-06 14:11 ` Bjorn Helgaas
2023-01-15 22:53 Stephen Rothwell
2023-01-18 21:34 ` Bjorn Helgaas
2021-11-04 22:56 Stephen Rothwell
2021-10-17 22:55 Stephen Rothwell
2021-10-18 14:26 ` Bjorn Helgaas
2021-10-10 23:12 Stephen Rothwell
2021-10-11 5:37 ` Manivannan Sadhasivam
2021-10-11 11:22 ` Lorenzo Pieralisi
2020-08-03 1:36 Stephen Rothwell
2020-07-22 1:39 Stephen Rothwell
2020-03-13 1:54 Stephen Rothwell
2020-03-09 23:07 Stephen Rothwell
2020-03-10 19:10 ` Bjorn Helgaas
2019-08-30 3:23 Stephen Rothwell
2019-08-30 12:30 ` Bjorn Helgaas
2019-08-31 4:21 ` Vidya Sagar
2019-08-31 8:49 ` Lorenzo Pieralisi
2019-08-31 14:40 ` Bjorn Helgaas
2019-08-31 16:49 ` Vidya Sagar
2018-09-26 5:00 Stephen Rothwell
2018-09-26 14:25 ` Keith Busch
2018-09-26 14:58 ` Keith Busch
2018-09-26 19:48 ` Bjorn Helgaas
2018-09-26 21:27 ` Stephen Rothwell
2018-03-26 1:31 Stephen Rothwell
2018-03-26 19:53 ` Bjorn Helgaas
2018-03-27 16:53 ` Rob Herring
2018-01-25 5:49 Stephen Rothwell
2018-01-25 13:55 ` Rob Herring
2018-01-25 14:58 ` Bjorn Helgaas
2018-01-29 4:41 ` Michael Ellerman
2016-04-26 1:13 Stephen Rothwell
2016-04-26 10:05 ` Joerg Roedel
2016-04-22 0:48 Stephen Rothwell
2016-01-11 1:42 Stephen Rothwell
2016-01-11 6:34 ` Bjorn Helgaas
2015-11-01 15:23 Stephen Rothwell
2015-11-02 0:00 ` Ley Foon Tan
2015-11-02 18:12 ` Bjorn Helgaas
2015-11-03 8:02 ` Ley Foon Tan
2015-11-02 0:09 ` Ley Foon Tan
2014-06-11 2:02 Stephen Rothwell
2014-06-11 2:23 ` Bjorn Helgaas
2014-05-22 4:09 Stephen Rothwell
2014-05-22 6:49 ` Sebastian Ott
2014-05-22 16:58 ` Bjorn Helgaas
2012-11-06 0:27 Stephen Rothwell
2012-11-06 1:55 ` Greg Kroah-Hartman
2012-11-06 2:09 ` Stephen Rothwell
2012-11-06 22:01 ` Bjorn Helgaas
2012-09-11 1:29 Stephen Rothwell
2012-09-11 14:28 ` Bjorn Helgaas
2012-02-13 2:21 Stephen Rothwell
2012-02-14 16:45 ` Jesse Barnes
2011-12-06 0:18 Stephen Rothwell
2011-12-06 3:16 ` Bjorn Helgaas
2011-12-06 17:28 ` Jesse Barnes
2011-10-25 13:44 Stephen Rothwell
2011-10-25 17:14 ` Myron Stowe
2011-10-25 19:58 ` Stephen Rothwell
[not found] <20110110125411.2f45fd2f.sfr@canb.auug.org.au>
2011-01-11 15:18 ` Narendra_K
2011-01-11 23:12 ` Stephen Rothwell
2010-10-18 2:20 Stephen Rothwell
2010-10-18 3:02 ` Jesse Barnes
2010-02-09 0:54 Stephen Rothwell
2010-02-09 16:27 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=30c8c87f-bba9-d71e-b8d5-4b547711bab2@ti.com \
--to=kishon@ti.com \
--cc=bhelgaas@google.com \
--cc=cyrille.pitchen@free-electrons.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=niklas.cassel@axis.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).