From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753615Ab0EGDI1 (ORCPT ); Thu, 6 May 2010 23:08:27 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:54211 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753135Ab0EGDIZ (ORCPT ); Thu, 6 May 2010 23:08:25 -0400 Date: Fri, 7 May 2010 13:08:21 +1000 From: Stephen Rothwell To: "Rafael J. Wysocki" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Helmut Schaa , "John W. Linville" , David Miller , Subject: linux-next: build failure after merge of the suspend tree Message-Id: <20100507130821.3fb72c9d.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rafael, After merging the suspend tree, today's linux-next build (x86_64 allmodconfig) failed like this: net/mac80211/scan.c: In function 'ieee80211_scan_state_decision': net/mac80211/scan.c:510: error: implicit declaration of function 'pm_qos_requirement' Caused by commit 62bad14fc6e0911a99882c261390968977d43283 ("PM QOS update") from the suspend tree interacting with commit df13cce53a7b28a81460e6bfc4857e9df4956141 ("mac80211: Improve software scan timing") from the net tree. I have added the following merge fixup patch and can carry it as necessary: From: Stephen Rothwell Date: Fri, 7 May 2010 13:02:54 +1000 Subject: [PATCH] wireless: update for pm_qos_requirement to pm_qos_request rename Signed-off-by: Stephen Rothwell --- net/mac80211/scan.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index e14c441..e1b0be7 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -510,7 +510,7 @@ static int ieee80211_scan_state_decision(struct ieee80211_local *local, bad_latency = time_after(jiffies + ieee80211_scan_get_channel_time(next_chan), local->leave_oper_channel_time + - usecs_to_jiffies(pm_qos_requirement(PM_QOS_NETWORK_LATENCY))); + usecs_to_jiffies(pm_qos_request(PM_QOS_NETWORK_LATENCY))); listen_int_exceeded = time_after(jiffies + ieee80211_scan_get_channel_time(next_chan), -- 1.7.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/