yes, i solved it the following "Git way": i did a --no-commit merge of
the tip/x86/irq tree into the tip/kmemcheck2 branch and then
"git-cherry-pick --no-commit"-ed the fix and thus made it a part of that
merge commit. This way the build failure is never visible during
bisection either.
tip/kmemcheck2 is a temporary topic tree: it contains the pull from your
tree and i'm testing it at the moment. It will be renamed to
tip/kmemcheck once it has passed testing.
btw., due to kmemcheck not being rebased anymore, this will work out
just fine in the future: i can pull fixes from your tree into
tip/kmemcheck and it will just all get sorted out by Git, despite the
cross-merge to tip/x86/irq.
If you rebased kmemcheck i'd have to do rather difficult (and
error-prone and harder to trust) manual merges every time you put a
kmemcheck fix into your tree, and any breakages introduced by new
kmemcheck fixes would not be easily bisectable either.
Ingo
--
