On Mon, 5 May 2014 16:51:04 -0400
Luiz Capitulino <lcapitul...@redhat.com> wrote:

> On Mon, 28 Apr 2014 15:02:35 +0800
> Amos Kong <ak...@redhat.com> wrote:
> 
> > Not a serious issue, but it's helpful if we can fix it.
> > 
> > V2: split change of scripts/qapi-visit.py to a split patch,
> >     eat space by using a special char as Markus suggested
> > V3: update commitlog, update special string, fix of adding
> >     const replace string by pattern
> > 
> > Amos Kong (3):
> >   qapi: fix coding style in parameters list
> >   qapi: add const prefix to 'char *' insider c_type()
> >   qapi: Suppress unwanted space between type and identifier
> 
> Applied to the qmp branch.
> 
> The last conflicts with another patch I applied to my tree (both
> are importing re module). I fixed it myself by dropping your import.

I couldn't understand what I wrote myself :)

The last patch in this series does:

-import sys
+import sys, re

However, module re is already included by another patch in my queue.
So, I dropped those two lines from the last patch in this series.

Reply via email to