I'll give this a go, per Terry's instructions in msg266846.

I've noticed up front that, due to other changes near the headers of a couple of files (specifically fcntl.rst and termios.rst), the patch doesn't apply cleanly anymore.  Is it permissible for me to fix that myself and upload a new version, or is it preferable for a patch's original author to handle such things?  In any case, there are plenty of other files for me to look over for now.