From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N39Ze-0001Op-PD
	for qemu-devel@nongnu.org; Wed, 28 Oct 2009 10:32:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N39ZZ-0001Hl-NH
	for qemu-devel@nongnu.org; Wed, 28 Oct 2009 10:32:30 -0400
Received: from [199.232.76.173] (port=60961 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N39ZZ-0001HO-EP
	for qemu-devel@nongnu.org; Wed, 28 Oct 2009 10:32:25 -0400
Received: from mx1.redhat.com ([209.132.183.28]:1025)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <markmc@redhat.com>) id 1N39ZZ-0001JR-1c
	for qemu-devel@nongnu.org; Wed, 28 Oct 2009 10:32:25 -0400
Subject: Handling merge conflicts [was Re: [Qemu-devel] [PATCH 00/19 v2]
	Add virtio-net/tap support for partial csums and GSO]
From: Mark McLoughlin <markmc@redhat.com>
In-Reply-To: <1256229830-28066-1-git-send-email-markmc@redhat.com>
References: <1256229830-28066-1-git-send-email-markmc@redhat.com>
Content-Type: text/plain
Date: Wed, 28 Oct 2009 14:30:26 +0000
Message-Id: <1256740226.5105.59.camel@blaa>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Reply-To: Mark McLoughlin <markmc@redhat.com>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: qemu-devel@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>

Hi Anthony,
	Thanks for merging this stuff ...

	In the process of merging it all into qemu-kvm, I noticed a couple of
problems:

  1) bb6e63644 lacked the change to add the type code to 
     qemu_new_vlan_client() so that and the subsequent 14 commits are 
     unbuildable

  2) 93db6685 references NET_CLIENT_TYPE_NIC and the receive_raw but 
     these aren't added until bb6e636443 and 70783b9c, so that's 117 
     unbuildable commits

Neither of these problems existed in the patches Gerd and I posted, so
presumably they came about by trying to merge the two patch sets?

How can we avoid this happening in future? What process could we have
used to avoid it?

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 ...?

Thanks,
Mark.