From: "John W. Linville" <linville@tuxdriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Wey-Yi Guy <wey-yi.w.guy@intel.com>,
Reinette Chatre <reinette.chatre@intel.com>
Subject: Re: linux-next: manual merge of the wireless tree with the wireless-current tree
Date: Thu, 1 Apr 2010 07:43:56 -0400 [thread overview]
Message-ID: <20100401114355.GA6897@tuxdriver.com> (raw)
In-Reply-To: <20100401125944.54adc73c.sfr@canb.auug.org.au>
On Thu, Apr 01, 2010 at 12:59:44PM +1100, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-4965.c between commit
> be6b38bcb175613f239e0b302607db346472c6b6 ("iwlwifi: counting number of
> tfds can be free for 4965") from the wireless-current tree and commit
> 74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
> functions from iwlcore to iwlagn") from the wireless tree.
>
> I fixed it up (see below) and can carry the fix for a while.
Yes, that looks correct to me.
Thanks!
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2010-04-01 11:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-01 1:59 linux-next: manual merge of the wireless tree with the wireless-current tree Stephen Rothwell
2010-04-01 11:43 ` John W. Linville [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-28 3:19 Stephen Rothwell
2011-09-28 9:10 ` Jouni Malinen
2011-09-14 3:05 Stephen Rothwell
2011-06-21 1:49 Stephen Rothwell
2011-06-21 18:05 ` Gustavo F. Padovan
2011-04-05 2:21 Stephen Rothwell
2011-04-05 2:21 Stephen Rothwell
2010-12-14 2:22 Stephen Rothwell
2010-08-30 1:58 Stephen Rothwell
2010-04-09 1:05 Stephen Rothwell
2010-04-07 2:58 Stephen Rothwell
2010-04-07 14:44 ` John W. Linville
2010-04-07 15:31 ` Stephen Rothwell
2010-04-07 23:19 ` David Miller
2010-03-11 2:15 Stephen Rothwell
2010-03-11 2:38 ` Bruno Randolf
2010-03-11 3:04 ` Stephen Rothwell
2010-02-23 1:26 Stephen Rothwell
2009-11-24 3:11 Stephen Rothwell
2009-11-24 15:05 ` John W. Linville
2009-07-09 1:40 Stephen Rothwell
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=20100401114355.GA6897@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--cc=sfr@canb.auug.org.au \
--cc=wey-yi.w.guy@intel.com \
/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).