Re: linux-next: manual merge of the net tree with the wireless-current tree
flat view
From: John W. Linville <hidden>
Date: 2010-03-30 13:15:14
Also in:
linux-next, lkml
On Tue, Mar 30, 2010 at 01:37:45PM +1100, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-agn.c between commit
d4dca4e53fde2953d74198a2c445db1d36ed9fd2 ("iwlwifi: clear unattended
interrupts in tasklet") from the wireless-current tree and commit
a4c8b2a692601de0a7bcb032b69f806050944dff ("iwlwifi: move ICT data to agn
part of union") from the net tree.
I fixed it up (see below) and can carry the fix for a while.Yes, that looks correct to me -- at least, that's what I did in wireless-testing. :-) John -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready.