From: Bruno Randolf <br1@einfach.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "John W. Linville" <linville@tuxdriver.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the wireless tree with the wireless-current tree
Date: Thu, 11 Mar 2010 11:38:11 +0900 [thread overview]
Message-ID: <201003111138.12070.br1@einfach.org> (raw)
In-Reply-To: <20100311131500.1057b6c5.sfr@canb.auug.org.au>
On Thursday 11 March 2010 11:15:00 Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/ath/ath5k/phy.c between commit
> 86415d43efd4f7093979cfa8a80232114266f1a4 ("ath5k: fix I/Q calibration
> (for real)") from the wireless-current tree and commit
> 49a85d211a63ad1d565842ebc535c5168d85d86a ("ath5k: IQ calibration for
> AR5211 is slightly different") from the wireless tree.
>
> I fixed it up (I think - see below) and can carry the fix for a while.
not sure what happened...
but wireless-next-2.6.git 86415d43efd4f7093979cfa8a80232114266f1a4 is an older
version of my patch. i have sent one which applies cleanly later on.
your fix is correct, though.
bruno
next prev parent reply other threads:[~2010-03-11 2:38 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-11 2:15 linux-next: manual merge of the wireless tree with the wireless-current tree Stephen Rothwell
2010-03-11 2:38 ` Bruno Randolf [this message]
2010-03-11 3:04 ` Stephen Rothwell
-- 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-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-04-01 1:59 Stephen Rothwell
2010-04-01 11:43 ` John W. Linville
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
2009-04-22 1:32 Stephen Rothwell
2009-04-22 18:23 ` reinette chatre
2009-04-22 18:38 ` John W. Linville
2009-02-19 5:27 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=201003111138.12070.br1@einfach.org \
--to=br1@einfach.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.