[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue
From: |
Peter Maydell |
Subject: |
Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue |
Date: |
Fri, 20 Jun 2014 19:24:48 +0100 |
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
- [Qemu-devel] [PULL 29/40] qapi event: convert VNC events, (continued)
- [Qemu-devel] [PULL 29/40] qapi event: convert VNC events, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 32/40] qapi event: convert GUEST_PANICKED, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 31/40] qapi event: convert BALLOON_CHANGE, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 37/40] qemu-char: move pty_chr_update_read_handler around, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 33/40] qapi event: convert QUORUM events, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 38/40] qemu-char: make writes thread-safe, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 36/40] qemu-char: do not call chr_write directly, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 40/40] monitor: protect event emission, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 39/40] monitor: protect outbuf and mux_out with mutex, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 12/40] qapi: add new schema file qapi-event.json, Luiz Capitulino, 2014/06/19
- Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue,
Peter Maydell <=
- Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue, Luiz Capitulino, 2014/06/20
- Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue, Paolo Bonzini, 2014/06/20
- Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue, Paolo Bonzini, 2014/06/20
- Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue, Eric Blake, 2014/06/20
- Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue, Wenchao Xia, 2014/06/24
- Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue, Eric Blake, 2014/06/24
- Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue, Peter Maydell, 2014/06/24
- Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue, Wenchao Xia, 2014/06/24