Re: linux-next: manual merge of the wireless tree with thewireless-current tree
From: John W. Linville
Date: Thu Apr 01 2010 - 07:45:16 EST
On Thu, Apr 01, 2010 at 12:59:44PM +1100, Stephen Rothwell wrote:
> Hi John,
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-4965.c between commit
> be6b38bcb175613f239e0b302607db346472c6b6 ("iwlwifi: counting number of
> tfds can be free for 4965") from the wireless-current tree and commit
> 74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
> functions from iwlcore to iwlagn") from the wireless tree.
> I fixed it up (see below) and can carry the fix for a while.
Yes, that looks correct to me.
John W. Linville Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx might be all we have. Be ready.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/