Re: linux-next: manual merge of the wireless tree with thewireless-current tree
From: David Miller
Date: Wed Apr 07 2010 - 19:19:08 EST
From: "John W. Linville" <linville@xxxxxxxxxxxxx>
Date: Wed, 7 Apr 2010 10:44:34 -0400
> On Wed, Apr 07, 2010 at 12:58:28PM +1000, Stephen Rothwell wrote:
>> Hi John,
>> Today's linux-next merge of the wireless tree got conflicts in
>> drivers/net/wireless/iwlwifi/iwl-tx.c and
>> drivers/net/wireless/iwlwifi/iwl-core.h between commit
>> de0f60ea94e132c858caa64a44b2012e1e8580b0 ("iwlwifi: avoid Tx queue memory
>> allocation in interface down") from the wireless-current tree and commit
>> 74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
>> functions from iwlcore to iwlagn") from the wireless tree.
>> The latter moved the code modified by the former. I couldn't see any
>> easy way to fix this up, so I effectively reverted the change in the
>> wireless-current tree. Please do the merge fixup, thanks.
> OK, I'll try to negotiate this today.
I think I took care of this when I merged net-2.6 into
net-next-2.6 last night.
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/