FWIW, i merged master on top of testing branch and that worked well for me.
What else would be required aside from few identing tweaks to make this merged?
Remove dead code and all the FIXME that are in in, kernel coding style ... If you fix that already, I'll review the code again and let you know what's still wrong :)
and preferably switch to BTSAP ... but that could wait.
Cheers,
Sylvain