|
From: | Anthony Liguori |
Subject: | Re: [Qemu-devel] [PATCH v2 1/3] add some tests for invalid JSON |
Date: | Tue, 25 May 2010 08:08:09 -0500 |
User-agent: | Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091209 Fedora/3.0-4.fc12 Lightning/1.0pre Thunderbird/3.0 |
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<address@hidden>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 <address@hidden> 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 <address@hidden> 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
[Prev in Thread] | Current Thread | [Next in Thread] |