* linux-next: manual merge of the suspend tree with the wireless tree
@ 2010-07-21 3:20 Stephen Rothwell
2010-07-21 10:15 ` Rafael J. Wysocki
2010-07-21 22:15 ` mark gross
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2010-07-21 3:20 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-next, linux-kernel, James Bottomley, mark gross,
John W. Linville
Hi Rafael,
Today's linux-next merge of the suspend tree got a conflict in
drivers/net/wireless/ipw2x00/ipw2100.c between commit
d267be307a3345ef06889511cad2aa1fecc83db7 ("ipw2100: mark
ipw2100_pm_qos_req static") from the wireless tree and commit
82f682514a5df89ffb3890627eebf0897b7a84ec ("pm_qos: Get rid of the
allocation in pm_qos_add_request()") from the suspend tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/ipw2x00/ipw2100.c
index 5bbff4c,7f0d98b..0000000
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@@ -174,7 -174,7 +174,7 @@@ that only one external action is invoke
#define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver"
#define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation"
- static struct pm_qos_request_list *ipw2100_pm_qos_req;
-struct pm_qos_request_list ipw2100_pm_qos_req;
++static struct pm_qos_request_list ipw2100_pm_qos_req;
/* Debugging stuff */
#ifdef CONFIG_IPW2100_DEBUG
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the suspend tree with the wireless tree
2010-07-21 3:20 linux-next: manual merge of the suspend tree with the wireless tree Stephen Rothwell
@ 2010-07-21 10:15 ` Rafael J. Wysocki
2010-07-21 22:15 ` mark gross
1 sibling, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2010-07-21 10:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, James Bottomley, mark gross,
John W. Linville
On Wednesday, July 21, 2010, Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> Today's linux-next merge of the suspend tree got a conflict in
> drivers/net/wireless/ipw2x00/ipw2100.c between commit
> d267be307a3345ef06889511cad2aa1fecc83db7 ("ipw2100: mark
> ipw2100_pm_qos_req static") from the wireless tree and commit
> 82f682514a5df89ffb3890627eebf0897b7a84ec ("pm_qos: Get rid of the
> allocation in pm_qos_add_request()") from the suspend tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, please carry the fix, modifying any of the involved trees would make it
depend on the other.
Rafael
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the suspend tree with the wireless tree
2010-07-21 3:20 linux-next: manual merge of the suspend tree with the wireless tree Stephen Rothwell
2010-07-21 10:15 ` Rafael J. Wysocki
@ 2010-07-21 22:15 ` mark gross
1 sibling, 0 replies; 3+ messages in thread
From: mark gross @ 2010-07-21 22:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rafael J. Wysocki, linux-next, linux-kernel, James Bottomley,
mark gross, John W. Linville
On Wed, Jul 21, 2010 at 01:20:06PM +1000, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the suspend tree got a conflict in
> drivers/net/wireless/ipw2x00/ipw2100.c between commit
> d267be307a3345ef06889511cad2aa1fecc83db7 ("ipw2100: mark
> ipw2100_pm_qos_req static") from the wireless tree and commit
> 82f682514a5df89ffb3890627eebf0897b7a84ec ("pm_qos: Get rid of the
> allocation in pm_qos_add_request()") from the suspend tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/net/wireless/ipw2x00/ipw2100.c
> index 5bbff4c,7f0d98b..0000000
> --- a/drivers/net/wireless/ipw2x00/ipw2100.c
> +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
> @@@ -174,7 -174,7 +174,7 @@@ that only one external action is invoke
> #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver"
> #define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation"
>
> - static struct pm_qos_request_list *ipw2100_pm_qos_req;
> -struct pm_qos_request_list ipw2100_pm_qos_req;
> ++static struct pm_qos_request_list ipw2100_pm_qos_req
It should be static. Thanks
--mgross
>
> /* Debugging stuff */
> #ifdef CONFIG_IPW2100_DEBUG
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-21 22:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-21 3:20 linux-next: manual merge of the suspend tree with the wireless tree Stephen Rothwell
2010-07-21 10:15 ` Rafael J. Wysocki
2010-07-21 22:15 ` mark gross
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).