From: Luiz Capitulino <lcapitulino@redhat.com>
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
Subject: Re: [Qemu-devel] [PATCH V6 09/10] tests: add cases for inherited struct and union with discriminator
Date: Thu, 13 Feb 2014 10:11:24 -0500 [thread overview]
Message-ID: <20140213101124.1d8ed0c0@redhat.com> (raw)
In-Reply-To: <877g8zvzbp.fsf@blackfin.pond.sub.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.
next prev parent reply other threads:[~2014-02-13 15:11 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-10 21:48 [Qemu-devel] [PATCH V6 00/10] qapi script: support enum as discriminator and better enum name Wenchao Xia
2014-02-10 21:48 ` [Qemu-devel] [PATCH V6 01/10] qapi script: remember enum values Wenchao Xia
2014-02-10 21:48 ` [Qemu-devel] [PATCH V6 02/10] qapi script: add check for duplicated key Wenchao Xia
2014-02-13 15:14 ` Markus Armbruster
2014-02-14 1:50 ` Wenchao Xia
2014-02-17 8:28 ` Markus Armbruster
2014-02-10 21:48 ` [Qemu-devel] [PATCH V6 03/10] qapi script: check correctness of discriminator values in union Wenchao Xia
2014-02-13 15:14 ` Markus Armbruster
2014-02-14 2:43 ` Wenchao Xia
2014-02-14 9:23 ` Markus Armbruster
2014-02-17 1:50 ` Wenchao Xia
2014-02-17 8:11 ` Markus Armbruster
2014-02-17 13:59 ` Luiz Capitulino
2014-02-10 21:48 ` [Qemu-devel] [PATCH V6 04/10] qapi script: code move for generate_enum_name() Wenchao Xia
2014-02-10 21:48 ` [Qemu-devel] [PATCH V6 05/10] qapi script: use same function to generate enum string Wenchao Xia
2014-02-10 21:48 ` [Qemu-devel] [PATCH V6 06/10] qapi script: support pre-defined enum type as discriminator in union Wenchao Xia
2014-02-10 21:48 ` [Qemu-devel] [PATCH V6 07/10] qapi: convert BlockdevOptions to use enum discriminator Wenchao Xia
2014-02-10 21:48 ` [Qemu-devel] [PATCH V6 08/10] qapi script: do not allow string discriminator Wenchao Xia
2014-02-13 15:18 ` Markus Armbruster
2014-02-10 21:48 ` [Qemu-devel] [PATCH V6 09/10] tests: add cases for inherited struct and union with discriminator Wenchao Xia
2014-02-13 14:53 ` Markus Armbruster
2014-02-13 15:11 ` Luiz Capitulino [this message]
2014-02-14 2:47 ` Wenchao Xia
2014-02-10 21:48 ` [Qemu-devel] [PATCH V6 10/10] qapi script: do not add "_" for every capitalized char in enum Wenchao Xia
2014-02-11 13:17 ` [Qemu-devel] [PATCH V6 00/10] qapi script: support enum as discriminator and better enum name Eric Blake
2014-02-11 19:13 ` Luiz Capitulino
2014-02-13 15:22 ` Luiz Capitulino
2014-02-13 15:23 ` Markus Armbruster
2014-02-14 2:53 ` Wenchao Xia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140213101124.1d8ed0c0@redhat.com \
--to=lcapitulino@redhat.com \
--cc=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=xiawenc@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).