yeah, we have this fixup in -tip as well, in a structured way: you might
want to start tracking the tip/tracing/mmiotrace-mergefixups branch to
pick it up.
or we could offer you a full auto-tip-next plug-and-play branch as well.
(there's no reason to redo all these integration steps)
Ingo
--