Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue

[Peter Maydell]

On 19 June 2014 20:39, Luiz Capitulino <address@hidden> wrote:
> The following changes since commit 6baa963f4dcc211801608ebe1e0482b51653350c:
>
>   Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging 
> (2014-06-19 16:18:04 +0100)
>
> are available in the git repository at:
>
>
>   git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> for you to fetch changes up to b98ff90e9459e0113da8502c03670a9539f90aa1:
>
>   monitor: protect event emission (2014-06-19 15:34:33 -0400)

CONFLICT (content): Merge conflict in vl.c
CONFLICT (content): Merge conflict in qemu-char.c
CONFLICT (content): Merge conflict in qapi-schema.json
CONFLICT (content): Merge conflict in monitor.c
CONFLICT (content): Merge conflict in include/monitor/monitor.h
CONFLICT (content): Merge conflict in hw/core/qdev.c
CONFLICT (modify/delete): docs/qmp/qmp-events.txt deleted in
remotes/qmp-unstable/queue/qmp and modified in HEAD. Version HEAD of
docs/qmp/qmp-events.txt left in tree.

That's more conflicts than I feel happy fixing up by hand;
could you rebase and resend, please?

(I suspect you just lost out to MST's 100-patch monster
that got merged just before this one; sorry.)

thanks
-- PMM