On 10/28/2009 06:36 PM, Anthony Liguori wrote:
Avi Kivity wrote:
Why? When you detect the conflict, ask the unlucky second to rebase
(on top of some git branch). The rebased series doesn't need a
re-review unless the submitter says he needed to rework it
significantly.
(IOW, the submitter's rebase doesn't need more review than your
conflict resolution)
The rebasing is really trivial in most circumstances. It's akin to do a
merge conflict resolution after a git pull.
My mistake here was not in how I handled the conflict resolution but in
how I folded those commits back into the tree.
Well, if it's just an error I don't see a need for a change in
procedure. FWIW, I do a lot of rebasing too (for different reasons -
not introduce a bug and its fix in the same pull, cross-arch compile
fixes, fold reverts and incremental fixes). To ensure I don't screw
things up, I always compare the result of the rebase with the original
(git diff should show nothing), and build-test every revision on every
arch. With ccache it's fairly reasonable, even on s390.
--
Do not meddle in the internals of kernels, for they are subtle and quick to
panic.
