Sorry for the confusion. Yes, your fix is in these trees already, however the other fix (from YC Chen in comment #99) was also accepted upstream and should be backported too. That's what I'm working on at the moment. And no, our tools can't match new upstream commits with patches in our trees. That has to be done manually, and I'm working on that too.