From: "Rafael J. Wysocki" <rjw@sisk•pl>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: 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 12:15:33 +0200 [thread overview]
Message-ID: <201007211215.33596.rjw@sisk.pl> (raw)
In-Reply-To: <20100721132006.ff026db8.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2010-07-21 10:17 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 [this message]
2010-07-21 22:15 ` mark gross
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=201007211215.33596.rjw@sisk.pl \
--to=rjw@sisk$(echo .)pl \
--cc=James.Bottomley@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=markgross@thegnar$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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