On Tue, Dec 03, 2013 at 07:19:23PM +0200, Emmanuel Grumbach wrote: > > > On 12/02/2013 10:51 PM, Emmanuel Grumbach wrote: > > Hi John, > > > > This is the fixed and enlarged pull request for 3.14. It includes the > > patches in my previous pull request that was based on a bad patch. > > > > I have here a big rework of the rate control by Eyal. This is obviously > > the biggest part of this batch. > > I also have enhancement of protection flags by Avri and a few bits for > > WoWLAN by Eliad and Luca. Johannes cleans up the debugfs plus a few > > fixes. I provided a few things for Bluetooth coexistence. > > Besides this we have an implementation for low priority scan. > > > > Note that I had to merge iwlwifi-fixes into -next to solve conflicts > > before they hit linux-next. > > Please let me know about issues you may face - Thanks! > > > > So - I found out that merging iwlwifi-fixes wasn't a good idea... So I > updated my tree and added a trivial compilation fix. > > New head: 2f579448f3a60c8ede544dd0951b8d2a2e282ba2. > > I hope that I have done all the possible mistakes now and that next time > I will get it right the first time... Sorry for all the mess... This has a couple of merge conflicts when pulling it into wireless-next. I don't have the time to work through them today, so I'm not pulling. If you would like to work through the resolution and advise me on how to do it, I'd love to hear about it. :-) John -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
