Messages in this thread | | | Date | Mon, 28 Dec 2009 18:41:56 -0500 | From | "John W. Linville" <> | Subject | Re: linux-next: manual merge of the net tree with the wireless-current tree |
| |
On Tue, Dec 29, 2009 at 09:54:32AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net tree got a conflict in > drivers/net/wireless/libertas/scan.c between commit > 659c8e5243caf14564155ad8421404f044dd8031 ("libertas: Remove carrier > signaling from the scan code") from the wireless-current tree and commit > 602114ae595af6c89eab149cf9f939e3f7ef4a34 ("libertas: add access functions > for mesh open/connect status") from the net tree. > > I fixed it up (see below) and can carry the fix for a while.
You have the correct fix. I'll get this resolved in my trees soon.
Thanks,
John -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready.
| |