From: mark gross <markgross@thegnar.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
James Bottomley <James.Bottomley@suse.de>,
mark gross <markgross@thegnar.org>,
"John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the suspend tree with the wireless tree
Date: Wed, 21 Jul 2010 15:15:16 -0700 [thread overview]
Message-ID: <20100721221516.GC2610@gvim.org> (raw)
In-Reply-To: <20100721132006.ff026db8.sfr@canb.auug.org.au>
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
prev parent reply other threads:[~2010-07-21 22:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100721221516.GC2610@gvim.org \
--to=markgross@thegnar.org \
--cc=James.Bottomley@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).