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

[Paolo Bonzini <pbonzini@redhat.com>]

Il 20/06/2014 20:44, Luiz Capitulino ha scritto:
> On Fri, 20 Jun 2014 19:24:48 +0100
> Peter Maydell <peter.maydell@linaro.org> wrote:
>
>> On 19 June 2014 20:39, Luiz Capitulino <lcapitulino@redhat.com> 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.
>
> Fun...
>
>> That's more conflicts than I feel happy fixing up by hand;
>> could you rebase and resend, please?
>
> Peter, I've dropped the series that's causing conflicts, can you try to
> pull again?
>
> Paolo, Wenchao, it's the QAPI event series that doesn't apply anymore. Can
> you please rebase it and post a new version? Could you also:
>
>  1. Add/keep Reviewed-bys of patches that did not change
>  2. Drop Reviewed-bys of patches that changed
>  3. Add Eric's review suggestions
>  4. Test build all targets

I'm fixing the conflicts.  Peter, please don't pull.  I prefer to have 
this fixed in a merge commit than as a huge rebase.  The conflicts are 
many but not messy, and it will avoid bisection problems in the future.

Paolo

Paolo