From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50172)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1WDxwv-0007c3-Iu
	for qemu-devel@nongnu.org; Thu, 13 Feb 2014 10:11:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1WDxwp-00025J-GZ
	for qemu-devel@nongnu.org; Thu, 13 Feb 2014 10:11:37 -0500
Received: from mx1.redhat.com ([209.132.183.28]:2225)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1WDxwp-000259-8S
	for qemu-devel@nongnu.org; Thu, 13 Feb 2014 10:11:31 -0500
Date: Thu, 13 Feb 2014 10:11:24 -0500
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20140213101124.1d8ed0c0@redhat.com>
In-Reply-To: <877g8zvzbp.fsf@blackfin.pond.sub.org>
References: <1392068921-3327-1-git-send-email-xiawenc@linux.vnet.ibm.com>
	<1392068921-3327-10-git-send-email-xiawenc@linux.vnet.ibm.com>
	<877g8zvzbp.fsf@blackfin.pond.sub.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH V6 09/10] tests: add cases for inherited
 struct and union with discriminator
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Markus Armbruster <armbru@redhat.com>
Cc: kwolf@redhat.com, mdroth@linux.vnet.ibm.com, Wenchao Xia <xiawenc@linux.vnet.ibm.com>, qemu-devel@nongnu.org

On Thu, 13 Feb 2014 15:53:30 +0100
Markus Armbruster <armbru@redhat.com> wrote:

> Wenchao Xia <xiawenc@linux.vnet.ibm.com> writes:
> 
> > Test for inherit and complex union.
> 
> This patch conflicts badly with my test coverage work in "[PATCH v2
> 00/13] qapi: Test coverage & clean up generated code".  My series
> systematically covers code generation in scripts/qapi*py, and that takes
> me seven patches.
> 
> If I put your patch first, mine all explode, and I get to start over.
> 
> Putting my series first looks far easier to resolve, because only this
> one patch conflicts.  Would you mind me rebasing your series on top of
> mine?

If it's only this patch that causes conflicts, what about the
following:

 1. I apply patches 1-8 plus patch 10
 2. Markus rebases patch 9 and adds it to his series
 3. Markus post a new version

Does this work for everyone?

The only drawback is that both series will miss today's boat, but this
would happen at this point anyway.