From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "John W. Linville" <linville@tuxdriver.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
Sujith Manoharan <Sujith.Manoharan@Atheros.com>,
Luis Rodriguez <Luis.Rodriguez@Atheros.com>,
Bennyam Malavazi <Bennyam.Malavazi@Atheros.com>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the wireless tree
Date: Tue, 2 Dec 2008 12:52:23 -0800 [thread overview]
Message-ID: <20081202205223.GD9351@tesla> (raw)
In-Reply-To: <20081126194041.72bf3af5.sfr@canb.auug.org.au>
On Wed, Nov 26, 2008 at 12:40:41AM -0800, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/ath9k/recv.c between commits
> b4b6cda2298b0c9a0af902312184b775b8867c65 ("ath9k: correct expected max RX
> buffer size") and ca0c7e5101fd4f37fed8e851709f08580b92fbb3 ("ath9k: Fix
> SW-IOMMU bounce buffer starvation") from the wireless-current tree and
> commits fd568653b38a91154b193338c312927385e77da1 ("ath9k: Revamp RX
> handling") and from the wireless tree.
>
> I fixed it up (see below - I hope it is correct) and assume that it will
> be fixed soon.
Just sent a port for 2.6.27, hope it helps.
Luis
next prev parent reply other threads:[~2008-12-02 20:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-26 8:40 linux-next: manual merge of the wireless tree Stephen Rothwell
2008-12-02 20:52 ` Luis R. Rodriguez [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-11-20 3:07 Stephen Rothwell
2008-11-20 8:27 ` David Miller
2008-11-20 13:48 ` John W. Linville
2008-09-17 7:43 Stephen Rothwell
2008-09-17 7:45 ` Johannes Berg
2008-07-03 4:43 Stephen Rothwell
2008-07-03 4:38 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=20081202205223.GD9351@tesla \
--to=lrodriguez@atheros.com \
--cc=Bennyam.Malavazi@Atheros.com \
--cc=Luis.Rodriguez@Atheros.com \
--cc=Sujith.Manoharan@Atheros.com \
--cc=davem@davemloft.net \
--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.