Re: [Qemu-devel] [PATCH v2 01/54] qapi: fix type_seen key error

[Markus Armbruster]

Marc-André Lureau <address@hidden> writes:

> On Fri, Aug 25, 2017 at 2:57 PM Eduardo Habkost <address@hidden> wrote:
>
>> On Fri, Aug 25, 2017 at 08:02:26AM +0200, Markus Armbruster wrote:
>> > Conflicts with Eduardo's "[PATCH v2] qapi: Fix error handling code on
>> > alternate conflict".
>> > Message-Id: <address@hidden>
>> >
>> > Marc-André, could you have a look?  You can rebase your fix on top of
>> > Eduardo's, or merge the two into one commit.
>>
>> Both patches seem to be fixing the same bug.
>>
>
> Yes, it is solved differently. But take Eduardo's patch, it has more
> extensive tests .

Okay.

Too bad I didn't remember Eduardo's patch when I got yours.