Hi John, On 12/03/2013 07:19 PM, 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... > Since you merged wireless into wireless-next, I decided to rebase my tree on top of wireless-next to make your life easier. I solved the conflicts you would have faced. New head: 9d10849e4ea8bf9d8da80afa73918a9fe45c09ef.
Attachment:
signature.asc
Description: OpenPGP digital signature
