2010-07-21 03:20:09

by Stephen Rothwell

Subject: linux-next: manual merge of the suspend tree with the wireless tree

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 [email protected]

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

2010-07-21 10:17:30

by Rafael J. Wysocki

Subject: Re: linux-next: manual merge of the suspend tree with the wireless tree

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

2010-07-21 22:15:24

by mark gross

Subject: Re: linux-next: manual merge of the suspend tree with the wireless tree

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 [email protected]
>
> 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