From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDxfb-0000rV-Mq for qemu-devel@nongnu.org; Thu, 13 Feb 2014 09:53:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDxfV-0004o0-Ok for qemu-devel@nongnu.org; Thu, 13 Feb 2014 09:53:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46502) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDxfV-0004mu-Gt for qemu-devel@nongnu.org; Thu, 13 Feb 2014 09:53:37 -0500 From: Markus Armbruster References: <1392068921-3327-1-git-send-email-xiawenc@linux.vnet.ibm.com> <1392068921-3327-10-git-send-email-xiawenc@linux.vnet.ibm.com> Date: Thu, 13 Feb 2014 15:53:30 +0100 In-Reply-To: <1392068921-3327-10-git-send-email-xiawenc@linux.vnet.ibm.com> (Wenchao Xia's message of "Tue, 11 Feb 2014 05:48:40 +0800") Message-ID: <877g8zvzbp.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH V6 09/10] tests: add cases for inherited struct and union with discriminator List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wenchao Xia Cc: kwolf@redhat.com, lcapitulino@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com Wenchao Xia 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?