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

[Gerd Hoffmann]

  Hi,

> Should either Gerd or I have merged the others' changes into our tree
> and asked you to pull? Should you just refuse conflicts and ask us to
> re-post? Or ...?

I think the best way to deal with that would be to simply not merge 
stuff which doesn't apply.  Likewise for stuff which doesn't build.

Pick one patch series, merge it, ask for a rebase of the other series, 
i.e. basically offload the conflict resolving to the patch submitter. 
Reduces your workload and non-trivial conflicts are better handled by 
the submitter anyway.

Problem is that this model doesn't work very well the bulk merges we 
have right now, so I'd suggest to also merge smaller batches more 
frequently.

cheers,
  Gerd