Re: Handling merge conflicts [was Re: [Qemu-devel] [PATCH 00/19 v2] Add virtio-net/tap support for partial csums and GSO]

[Gerd Hoffmann]

On 10/28/09 17:24, Avi Kivity wrote:
> > That would require a series to be merged within a very short time
> > period which does not allow appropriate review on the list.
>
> 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.

I fully agree here.  For a new version of a patch (series) where the 
only change is rebasing and resolving conflicts I don't see the point in 
requiring another full week for review.

cheers
  Gerd