Re: [Qemu-devel] [PATCH v2 1/3] add some tests for invalid JSON

[Anthony Liguori <aliguori@linux.vnet.ibm.com>]

On 05/25/2010 02:28 AM, Paolo Bonzini wrote:
> On 05/24/2010 10:17 PM, Anthony Liguori wrote:
>> On 05/24/2010 02:39 AM, Paolo Bonzini wrote:
>>> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
>>
>> I think this series conflicts a bit with Luiz's series which I just
>> pushed. Could you rebase against the latest?
>
> You didn't apply this one yet, at least I don't see it on qemu.git
>
> commit e546343ee0f3f904529d32c1a9a60f5baa181852
> Author: Luiz Capitulino <lcapitulino@redhat.com>
> Date:   Wed May 19 18:15:32 2010 -0300
>
>     json-lexer: Drop 'buf'
>
>     QString supports adding a single char, 'buf' is unneeded.
>
>     Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
>
> I based my series on top of Luiz's, so it should apply.

Yeah, I confused myself into thinking that Luiz's series was more 
contentious than it is.  Nevermind, your patches are fine on top of his.

Regards,

Anthony Liguori

> The above is the only commit that is actually required.  I can ping 
> the series once Luiz's patches are applied, so you can disregard it in 
> the meanwhile.
>
> Paolo