* linux-next: build failure after merge of the suspend tree
@ 2010-05-07 3:08 Stephen Rothwell
2010-05-08 2:13 ` Rafael J. Wysocki
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-05-07 3:08 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-next, linux-kernel, Helmut Schaa, John W. Linville,
David Miller, netdev
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@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@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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: linux-next: build failure after merge of the suspend tree
2010-05-07 3:08 linux-next: build failure after merge of the suspend tree Stephen Rothwell
@ 2010-05-08 2:13 ` Rafael J. Wysocki
2010-05-21 0:29 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Rafael J. Wysocki @ 2010-05-08 2:13 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Helmut Schaa, John W. Linville,
David Miller, netdev
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@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@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),
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: build failure after merge of the suspend tree
2010-05-08 2:13 ` Rafael J. Wysocki
@ 2010-05-21 0:29 ` Stephen Rothwell
2010-05-21 5:46 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-05-21 0:29 UTC (permalink / raw)
To: John W. Linville, David Miller, Linus
Cc: Rafael J. Wysocki, linux-next, linux-kernel, Helmut Schaa, netdev
Hi John, Dave,
On Sat, 8 May 2010 04:13:24 +0200 "Rafael J. Wysocki" <rjw@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@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@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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: linux-next: build failure after merge of the suspend tree
2010-05-21 0:29 ` Stephen Rothwell
@ 2010-05-21 5:46 ` David Miller
2010-05-21 5:51 ` Eric Dumazet
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2010-05-21 5:46 UTC (permalink / raw)
To: sfr; +Cc: linville, torvalds, rjw, linux-next, linux-kernel, Helmut.Schaa,
netdev
From: Stephen Rothwell <sfr@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@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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the suspend tree
2010-05-21 5:46 ` David Miller
@ 2010-05-21 5:51 ` Eric Dumazet
2010-05-21 5:56 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Eric Dumazet @ 2010-05-21 5:51 UTC (permalink / raw)
To: David Miller
Cc: sfr, linville, torvalds, rjw, linux-next, linux-kernel,
Helmut.Schaa, netdev
Le jeudi 20 mai 2010 à 22:46 -0700, David Miller a écrit :
> From: Stephen Rothwell <sfr@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@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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the suspend tree
2010-05-21 5:51 ` Eric Dumazet
@ 2010-05-21 5:56 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2010-05-21 5:56 UTC (permalink / raw)
To: eric.dumazet
Cc: sfr, linville, torvalds, rjw, linux-next, linux-kernel,
Helmut.Schaa, netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 21 May 2010 07:51:57 +0200
> Linus merged your tree David.
This must have happened in the past hour :-)
Great, I can sort this now.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-05-21 5:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-07 3:08 linux-next: build failure after merge of the suspend tree Stephen Rothwell
2010-05-08 2:13 ` Rafael J. Wysocki
2010-05-21 0:29 ` Stephen Rothwell
2010-05-21 5:46 ` David Miller
2010-05-21 5:51 ` Eric Dumazet
2010-05-21 5:56 ` David Miller
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).