Re: linux-next: manual merge of the wireless-next tree with the net tree

Hi John, Dave,

On Tue, 12 Jun 2012 11:41:29 +1000 Stephen Rothwell [off-list ref] wrote:

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/pcie/trans.c between commit d012d04e4d63
("iwlwifi: disable the buggy chain extension feature in HW") from the net
tree and commit 4beaf6c2f8af ("iwlwifi: s/txq_setup/txq_enable") from the
wireless-next tree.

I fixed it up (I think - see below) and can carry the fix as necessary.

So this conflict has now been fixed up in both the net-next (commit
43b03f1f6d68) and wireless-next (commit 627ae3ddd6f9) trees, but slightly
differently :-(  I used the version from the net-next tree.

Just a heads up.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au