![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png){kind=small}
I made a moderately invasive change to the mainline code for our next release that cleans up a potential locking problem. And since the word "locking" was in the vicinity, I decided that I should merge this to my similar locking line with the changes I spent the last year working on.
Two days later, the merge almost compiles. I have one last fix to make...
*sigh*
Two days later, the merge almost compiles. I have one last fix to make...
*sigh*