linux-next: build failure after merge of the suspend tree
in [Kernel]
|
Prev: [PATCH] Check kmalloc return value before use the buffer
Next: [PATCH][GIT PULL] perf: Fix check at end of event search
From: Stephen Rothwell on 6 May 2010 23:10 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 <sfr(a)canb.auug.org.au> 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 <sfr(a)canb.auug.org.au> --- 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(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Rafael J. Wysocki on 7 May 2010 22:20 On Friday 07 May 2010, Stephen Rothwell wrote: > 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: Thanks a lot, please do so if that's not a problem. Both trees are based on Linus' current and I don't see a good way of fixing this issue in any of them individually. Rafael > From: Stephen Rothwell <sfr(a)canb.auug.org.au> > 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 <sfr(a)canb.auug.org.au> > --- > 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), > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 20 May 2010 20:30 Hi John, Dave, On Sat, 8 May 2010 04:13:24 +0200 "Rafael J. Wysocki" <rjw(a)sisk.pl> wrote: > > On Friday 07 May 2010, Stephen Rothwell wrote: > > > > 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: > > Thanks a lot, please do so if that's not a problem. > > Both trees are based on Linus' current and I don't see a good way of fixing > this issue in any of them individually. The suspend tree has been merged into Linus' tree, so this patch is needed in the net tree before it is merged (or as part of the merge). Here is the patch again: From: Stephen Rothwell <sfr(a)canb.auug.org.au> 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 <sfr(a)canb.auug.org.au> --- 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(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: David Miller on 21 May 2010 01:50 From: Stephen Rothwell <sfr(a)canb.auug.org.au> Date: Fri, 21 May 2010 10:29:13 +1000 > On Sat, 8 May 2010 04:13:24 +0200 "Rafael J. Wysocki" <rjw(a)sisk.pl> wrote: >> >> On Friday 07 May 2010, Stephen Rothwell wrote: >> Both trees are based on Linus' current and I don't see a good way of fixing >> this issue in any of them individually. > > The suspend tree has been merged into Linus' tree, so this patch is > needed in the net tree before it is merged (or as part of the merge). Since the net tree is still on it's way to Linus, we'll just have to wait for him to do that merge. Then we can sort this out. I don't want to touch a tree that is already on it's way. Thanks Stephen. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Eric Dumazet on 21 May 2010 02:00
Le jeudi 20 mai 2010 à 22:46 -0700, David Miller a écrit : > From: Stephen Rothwell <sfr(a)canb.auug.org.au> > Date: Fri, 21 May 2010 10:29:13 +1000 > > > On Sat, 8 May 2010 04:13:24 +0200 "Rafael J. Wysocki" <rjw(a)sisk.pl> wrote: > >> > >> On Friday 07 May 2010, Stephen Rothwell wrote: > >> Both trees are based on Linus' current and I don't see a good way of fixing > >> this issue in any of them individually. > > > > The suspend tree has been merged into Linus' tree, so this patch is > > needed in the net tree before it is merged (or as part of the merge). > > Since the net tree is still on it's way to Linus, we'll just have to > wait for him to do that merge. > > Then we can sort this out. I don't want to touch a tree that is > already on it's way. Linus merged your tree David. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |