From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "John W. Linville" <linville@tuxdriver•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Bob Copeland <me@bobcopeland•com>,
Bruno Randolf <br1@einfach•org>
Subject: linux-next: manual merge of the wireless tree with Linus' tree
Date: Tue, 21 Sep 2010 12:20:58 +1000 [thread overview]
Message-ID: <20100921122058.bb402193.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath/ath5k/base.c between commit
d8e1ba76d619dbc0be8fbeee4e6c683b5c812d3a ("ath5k: check return value of
ieee80211_get_tx_rate") from Linus' tree and (probably) commit
bb18dec05909c96a13754f4e070e5d604cb2b805 ("ath5k: reorder base.c to
remove fwd decls") from the wireless tree.
I fixed it up (I think - I just applied the patch from Linus' tree to the
new position in the wireless tree file) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-09-21 2:20 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-21 2:20 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-02-14 0:19 linux-next: manual merge of the wireless tree with Linus' tree Stephen Rothwell
2012-01-04 1:40 Stephen Rothwell
2011-09-20 3:28 Stephen Rothwell
2011-09-20 12:55 ` John W. Linville
2011-09-20 3:22 Stephen Rothwell
2011-09-19 5:14 Stephen Rothwell
2011-09-19 5:28 ` Luciano Coelho
2011-09-15 3:14 Stephen Rothwell
2011-09-15 7:17 ` Helmut Schaa
2011-09-15 3:14 Stephen Rothwell
2011-08-30 3:46 Stephen Rothwell
2011-05-12 1:42 Stephen Rothwell
2011-05-11 1:52 Stephen Rothwell
2011-04-27 1:00 Stephen Rothwell
2011-04-13 2:30 Stephen Rothwell
2011-04-08 4:10 Stephen Rothwell
2011-04-08 5:11 ` Jussi Kivilinna
2011-04-08 4:10 Stephen Rothwell
2010-09-21 2:09 Stephen Rothwell
2010-09-21 6:53 ` Ohad Ben-Cohen
2010-09-21 8:57 ` Ohad Ben-Cohen
2010-09-21 15:08 ` John W. Linville
2010-08-17 1:52 Stephen Rothwell
2010-08-17 2:59 ` Rusty Russell
2010-08-17 3:07 ` Stephen Rothwell
2010-06-15 2:00 Stephen Rothwell
2010-06-15 14:42 ` John W. Linville
2010-05-10 1:27 Stephen Rothwell
2010-04-27 1:28 Stephen Rothwell
2010-01-06 2:29 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=20100921122058.bb402193.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=br1@einfach$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=me@bobcopeland$(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