Yeah, I don't want ignore .33-stable too. if I can't find the root cause
in 2-3 days, I'll revert guilty patch anyway.
It's a good idea to avoid fixing a bug one-way-in-stable,
other-way-in-mainline. Because then we have new code in both trees
which is different. And the -stable guys sensibly like to see code get
a bit of a shakedown in mainline before backporting it.
So it would be better to merge the "simple" patch into mainline, tagged
for -stable backporting. Then we can later implement the larger fix in
mainline, perhaps starting by reverting the "simple" fix.
.....ok. I don't have to prevent your code maintainship. although I still
think we need to fix the issue completely.