Prev: linux-next: build failure after merge of the net tree
Next: [Announce] sg3_utils-1.29 available
From: Stephen Rothwell on 6 Apr 2010 23:00
Hi John,

Today's linux-next merge of the wireless tree got conflicts in
drivers/net/wireless/iwlwifi/iwl-core.c,
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.

--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell on 7 Apr 2010 11:40
Hi John,

On Wed, 7 Apr 2010 10:44:34 -0400 "John W. Linville" <linville(a)tuxdriver.com> wrote:
>
> OK, I'll try to negotiate this today.

Excellent, thanks.

--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: David Miller on 7 Apr 2010 19:20
From: "John W. Linville" <linville(a)tuxdriver.com>
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-core.c,
>> 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(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: linux-next: build failure after merge of the net tree
Next: [Announce] sg3_utils-1.29 available