archive mirror
 help / color / mirror / Atom feed
* linux-next: wireless merge conflict
@ 2008-05-29  5:19 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2008-05-29  5:19 UTC (permalink / raw)
  To: John W. Linville; +Cc: linux-next, Ivo van Doorn

[-- Attachment #1: Type: text/plain, Size: 530 bytes --]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rt2x00/rt2x00dev.c between commit
2088d4174e4292aef892bb7095fc3c3ea5bd117c ("rt2x00: Don't count retries as
failure") from the wireless-current tree and commit
fb55f4d1fa252ba1e479284b79da1049d658c371 ("rt2x00: Fix TX status
reporting") from the wireless tree.

I fixed it up as you did in your merge-test-2 branch.

Stephen Rothwell          

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-05-29  5:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-29  5:19 linux-next: wireless merge conflict Stephen Rothwell

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).