From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "John W. Linville" <linville@tuxdriver•com>
Cc: linux-next@vger•kernel.org,
Emmanuel Grumbach <emmanuel.grumbach@intel•com>,
Rick Farrington <rickdic@hotmail•com>
Subject: linux-next: manual merge of the wireless tree
Date: Thu, 3 Jul 2008 14:38:32 +1000 [thread overview]
Message-ID: <20080703143832.bfa5911a.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 645 bytes --]
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-4965.c between commit
ec04fd60fd74a9db9c63fe11d519be3642cabfdd ("iwlwifi: fix incorrect 5GHz
rates reported in monitor mode") from the wireles-current tree (or maybe
the merge fixup with the net tree) and commit
1781a07fbe9cce3dc1697288a5edd260ea7edc02 ("iwlwifi: move RX handlers to
iwl-rx.c") from the wireless tree.
I took the version from the wireless tree (which matched the version in
you test merge, thanks).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-07-03 4:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-03 4:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-07-03 4:43 linux-next: manual merge of the wireless tree Stephen Rothwell
2008-09-17 7:43 Stephen Rothwell
2008-09-17 7:45 ` Johannes Berg
2008-11-20 3:07 Stephen Rothwell
2008-11-20 8:27 ` David Miller
2008-11-20 13:48 ` John W. Linville
2008-11-26 8:40 Stephen Rothwell
2008-12-02 20:52 ` Luis R. Rodriguez
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=20080703143832.bfa5911a.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=emmanuel.grumbach@intel$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=rickdic@hotmail$(echo .)com \
/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