| Message ID | 20190625160432.533aa140@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | linux-next: build failure after merge of the tip tree | expand |
Stephen Rothwell <sfr@canb.auug.org.au> writes: > After merging the tip tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/net/wireless/intersil/p54/txrx.c: In function 'p54_rx_data': > drivers/net/wireless/intersil/p54/txrx.c:386:28: error: implicit declaration of function 'ktime_get_boot_ns'; did you mean 'ktime_get_raw_ns'? [-Werror=implicit-function-declaration] > rx_status->boottime_ns = ktime_get_boot_ns(); > ^~~~~~~~~~~~~~~~~ > ktime_get_raw_ns > > Caused by commit > > c11c75ec784e ("p54: Support boottime in scan results") > > from the wireless-drivers-next tree interacting with commit > > 9285ec4c8b61 ("timekeeping: Use proper clock specifier names in functions") > > from the tip tree. > > I have added the following merge fix patch: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Tue, 25 Jun 2019 15:55:36 +1000 > Subject: [PATCH] p54: fix up for ktime_get_boot_ns() name change > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > drivers/net/wireless/intersil/p54/txrx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/intersil/p54/txrx.c b/drivers/net/wireless/intersil/p54/txrx.c > index be6968454282..873fea59894f 100644 > --- a/drivers/net/wireless/intersil/p54/txrx.c > +++ b/drivers/net/wireless/intersil/p54/txrx.c > @@ -383,7 +383,7 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb) > > fc = ((struct ieee80211_hdr *)skb->data)->frame_control; > if (ieee80211_is_probe_resp(fc) || ieee80211_is_beacon(fc)) > - rx_status->boottime_ns = ktime_get_boot_ns(); > + rx_status->boottime_ns = ktime_get_boottime_ns(); Thanks for the report. Any suggestions how to handle this? Or do we let Linus take care of this?
On Tue, 25 Jun 2019, Kalle Valo wrote: > Stephen Rothwell <sfr@canb.auug.org.au> writes: > > --- > > drivers/net/wireless/intersil/p54/txrx.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/net/wireless/intersil/p54/txrx.c b/drivers/net/wireless/intersil/p54/txrx.c > > index be6968454282..873fea59894f 100644 > > --- a/drivers/net/wireless/intersil/p54/txrx.c > > +++ b/drivers/net/wireless/intersil/p54/txrx.c > > @@ -383,7 +383,7 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb) > > > > fc = ((struct ieee80211_hdr *)skb->data)->frame_control; > > if (ieee80211_is_probe_resp(fc) || ieee80211_is_beacon(fc)) > > - rx_status->boottime_ns = ktime_get_boot_ns(); > > + rx_status->boottime_ns = ktime_get_boottime_ns(); > > Thanks for the report. Any suggestions how to handle this? Or do we let > Linus take care of this? As the core changes which cause this are in tip timers/core, I can just pick that up and be done with it. Ok? Thanks, tglx
Hi Kalle, On Tue, 25 Jun 2019 09:23:33 +0300 Kalle Valo <kvalo@codeaurora.org> wrote: > > Thanks for the report. Any suggestions how to handle this? Or do we let > Linus take care of this? Just let Linus take care of it ... mention it in the pull request ... I guess DaveM needs to know, right?
Stephen Rothwell <sfr@canb.auug.org.au> writes: > On Tue, 25 Jun 2019 09:23:33 +0300 Kalle Valo <kvalo@codeaurora.org> wrote: >> >> Thanks for the report. Any suggestions how to handle this? Or do we let >> Linus take care of this? > > Just let Linus take care of it ... mention it in the pull request ... Thanks, I'll do that. > I guess DaveM needs to know, right? Yeah, this commit goes from wireless-drivers-next to net-next and from there to Linus. I'll inform Dave in my pull request.
On Tue, 25 Jun 2019, Stephen Rothwell wrote: > Hi Kalle, > > On Tue, 25 Jun 2019 09:23:33 +0300 Kalle Valo <kvalo@codeaurora.org> wrote: > > > > Thanks for the report. Any suggestions how to handle this? Or do we let > > Linus take care of this? > > Just let Linus take care of it ... mention it in the pull request ... I > guess DaveM needs to know, right? Ah. I didn't realize that this is a new commit in Kalle's tree. So yes that's the right thing to do. Thanks, tglx
Thomas Gleixner <tglx@linutronix.de> writes: > On Tue, 25 Jun 2019, Stephen Rothwell wrote: > >> Hi Kalle, >> >> On Tue, 25 Jun 2019 09:23:33 +0300 Kalle Valo <kvalo@codeaurora.org> wrote: >> > >> > Thanks for the report. Any suggestions how to handle this? Or do we let >> > Linus take care of this? >> >> Just let Linus take care of it ... mention it in the pull request ... I >> guess DaveM needs to know, right? > > Ah. I didn't realize that this is a new commit in Kalle's tree. So yes > that's the right thing to do. Good, I'll do that then.
Hi all, On Tue, 25 Jun 2019 16:04:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > After merging the tip tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/net/wireless/intersil/p54/txrx.c: In function 'p54_rx_data': > drivers/net/wireless/intersil/p54/txrx.c:386:28: error: implicit declaration of function 'ktime_get_boot_ns'; did you mean 'ktime_get_raw_ns'? [-Werror=implicit-function-declaration] > rx_status->boottime_ns = ktime_get_boot_ns(); > ^~~~~~~~~~~~~~~~~ > ktime_get_raw_ns > > Caused by commit > > c11c75ec784e ("p54: Support boottime in scan results") > > from the wireless-drivers-next tree interacting with commit > > 9285ec4c8b61 ("timekeeping: Use proper clock specifier names in functions") > > from the tip tree. > > I have added the following merge fix patch: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Tue, 25 Jun 2019 15:55:36 +1000 > Subject: [PATCH] p54: fix up for ktime_get_boot_ns() name change > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > drivers/net/wireless/intersil/p54/txrx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/intersil/p54/txrx.c b/drivers/net/wireless/intersil/p54/txrx.c > index be6968454282..873fea59894f 100644 > --- a/drivers/net/wireless/intersil/p54/txrx.c > +++ b/drivers/net/wireless/intersil/p54/txrx.c > @@ -383,7 +383,7 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb) > > fc = ((struct ieee80211_hdr *)skb->data)->frame_control; > if (ieee80211_is_probe_resp(fc) || ieee80211_is_beacon(fc)) > - rx_status->boottime_ns = ktime_get_boot_ns(); > + rx_status->boottime_ns = ktime_get_boottime_ns(); > > if (unlikely(priv->hw->conf.flags & IEEE80211_CONF_PS)) > p54_pspoll_workaround(priv, skb); > -- > 2.20.1 I am still getting this conflict (the commit ids may have changed). Just a reminder in case you think Linus may need to know.
Hi all, On Tue, 25 Jun 2019 16:04:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > After merging the tip tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/net/wireless/intersil/p54/txrx.c: In function 'p54_rx_data': > drivers/net/wireless/intersil/p54/txrx.c:386:28: error: implicit declaration of function 'ktime_get_boot_ns'; did you mean 'ktime_get_raw_ns'? [-Werror=implicit-function-declaration] > rx_status->boottime_ns = ktime_get_boot_ns(); > ^~~~~~~~~~~~~~~~~ > ktime_get_raw_ns > > Caused by commit > > c11c75ec784e ("p54: Support boottime in scan results") > > from the wireless-drivers-next tree interacting with commit > > 9285ec4c8b61 ("timekeeping: Use proper clock specifier names in functions") > > from the tip tree. > > I have added the following merge fix patch: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Tue, 25 Jun 2019 15:55:36 +1000 > Subject: [PATCH] p54: fix up for ktime_get_boot_ns() name change > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > drivers/net/wireless/intersil/p54/txrx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/intersil/p54/txrx.c b/drivers/net/wireless/intersil/p54/txrx.c > index be6968454282..873fea59894f 100644 > --- a/drivers/net/wireless/intersil/p54/txrx.c > +++ b/drivers/net/wireless/intersil/p54/txrx.c > @@ -383,7 +383,7 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb) > > fc = ((struct ieee80211_hdr *)skb->data)->frame_control; > if (ieee80211_is_probe_resp(fc) || ieee80211_is_beacon(fc)) > - rx_status->boottime_ns = ktime_get_boot_ns(); > + rx_status->boottime_ns = ktime_get_boottime_ns(); > > if (unlikely(priv->hw->conf.flags & IEEE80211_CONF_PS)) > p54_pspoll_workaround(priv, skb); This patch is now needed in the merge between the net-next tree and Linus' tree.
diff --git a/drivers/net/wireless/intersil/p54/txrx.c b/drivers/net/wireless/intersil/p54/txrx.c index be6968454282..873fea59894f 100644 --- a/drivers/net/wireless/intersil/p54/txrx.c +++ b/drivers/net/wireless/intersil/p54/txrx.c @@ -383,7 +383,7 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb) fc = ((struct ieee80211_hdr *)skb->data)->frame_control; if (ieee80211_is_probe_resp(fc) || ieee80211_is_beacon(fc)) - rx_status->boottime_ns = ktime_get_boot_ns(); + rx_status->boottime_ns = ktime_get_boottime_ns(); if (unlikely(priv->hw->conf.flags & IEEE80211_CONF_PS)) p54_pspoll_workaround(priv, skb);
Hi all, After merging the tip tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/wireless/intersil/p54/txrx.c: In function 'p54_rx_data': drivers/net/wireless/intersil/p54/txrx.c:386:28: error: implicit declaration of function 'ktime_get_boot_ns'; did you mean 'ktime_get_raw_ns'? [-Werror=implicit-function-declaration] rx_status->boottime_ns = ktime_get_boot_ns(); ^~~~~~~~~~~~~~~~~ ktime_get_raw_ns Caused by commit c11c75ec784e ("p54: Support boottime in scan results") from the wireless-drivers-next tree interacting with commit 9285ec4c8b61 ("timekeeping: Use proper clock specifier names in functions") from the tip tree. I have added the following merge fix patch: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 25 Jun 2019 15:55:36 +1000 Subject: [PATCH] p54: fix up for ktime_get_boot_ns() name change Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/net/wireless/intersil/p54/txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)