Hunk #5 succeeded at 1186 (offset -5 lines).
At least, that's what it claimed. Turns out that hunk of the patch was not actually applied, meaning there's a silent failure mode in patch. Check the bug report for details. Now I know how I lost this piece of code during a previous forward merge. Ugh...