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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
