[lkml]   [2010]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the wireless tree with the wireless-current tree
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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2010-04-07 05:01    [W:0.068 / U:7.700 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site