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 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 --- 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 -- Cheers, Stephen Rothwell