Messages in this thread | | | Date | Thu, 15 Dec 2011 14:16:46 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the net-next tree with the wireless tree |
| |
Hi all,
On Thu, 15 Dec 2011 13:53:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/wireless/iwlwifi/iwl-agn.c between commit 81670a491849 > ("iwlwifi: tx_sync only on PAN context") from the wireless tree and > commits from the net-next tree. > > I used the version of this file from the wireless-next tree (where this > conflict has been resolved).
Unfortunately, it was the wrong resolution for the net-next tree due to other changes in this file :-(
So instead, I just used the version of this file from the net-next tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |