Comment 107 for bug 268502

I sent my proposed fix to the kernel team mailing list. It consists of three cherry-picks from upstream (though one hasn't merged into mainline yet), and some conflict resolution for the last patch.

For anyone that wants to build their own kernel and test it, I've rolled it all into a single patch, which I'm attaching.