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

2014-06-24 Thread Wenchao Xia
于 2014/6/24 21:24, Peter Maydell 写道: On 24 June 2014 14:20, Eric Blake wrote: Rebase your cleanups on to of this PULL request: https://lists.gnu.org/archive/html/qemu-devel/2014-06/msg05424.html I just applied that, so "rebase on top of master"... There is a test broken due to CompatGMutex

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

2014-06-24 Thread Peter Maydell
On 24 June 2014 14:20, Eric Blake wrote: > Rebase your cleanups on to of this PULL request: > https://lists.gnu.org/archive/html/qemu-devel/2014-06/msg05424.html I just applied that, so "rebase on top of master"... thanks -- PMM

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

2014-06-24 Thread Eric Blake
On 06/24/2014 07:08 AM, Wenchao Xia wrote: > 于 2014/6/21 4:02, Eric Blake 写道: >> On 06/20/2014 01:49 PM, Paolo Bonzini wrote: >> >>> >>> As I explained on IRC, many patches when rebased would have conflicts >>> with Igor's new event. I think this is much more complex than having >>> an "extraordin

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

2014-06-24 Thread Wenchao Xia
于 2014/6/21 4:02, Eric Blake 写道: On 06/20/2014 01:49 PM, Paolo Bonzini wrote: As I explained on IRC, many patches when rebased would have conflicts with Igor's new event. I think this is much more complex than having an "extraordinary" merge commit. I include the conflict resolution: - hw/a

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

2014-06-20 Thread Eric Blake
On 06/20/2014 01:49 PM, Paolo Bonzini wrote: > > As I explained on IRC, many patches when rebased would have conflicts > with Igor's new event. I think this is much more complex than having > an "extraordinary" merge commit. > > I include the conflict resolution: > > - hw/acpi/memory-hotplug

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

2014-06-20 Thread Paolo Bonzini
Il 20/06/2014 20:44, Luiz Capitulino ha scritto: > On Fri, 20 Jun 2014 19:24:48 +0100 > Peter Maydell wrote: > >> On 19 June 2014 20:39, Luiz Capitulino wrote: >>> The following changes since commit 6baa963f4dcc211801608ebe1e0482b51653350c: >>> >>> Merge remote-tracking branch 'remotes/bonzini

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

2014-06-20 Thread Paolo Bonzini
Il 20/06/2014 20:44, Luiz Capitulino ha scritto: On Fri, 20 Jun 2014 19:24:48 +0100 Peter Maydell wrote: On 19 June 2014 20:39, Luiz Capitulino wrote: The following changes since commit 6baa963f4dcc211801608ebe1e0482b51653350c: Merge remote-tracking branch 'remotes/bonzini/scsi-next' into

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

2014-06-20 Thread Luiz Capitulino
On Fri, 20 Jun 2014 19:24:48 +0100 Peter Maydell wrote: > On 19 June 2014 20:39, Luiz Capitulino wrote: > > The following changes since commit 6baa963f4dcc211801608ebe1e0482b51653350c: > > > > Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging > > (2014-06-19 16:18:04 +0100

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

2014-06-20 Thread Peter Maydell
On 19 June 2014 20:39, Luiz Capitulino 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.

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

2014-06-19 Thread Luiz Capitulino
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