Re: [Qemu-devel] [PULL 000/103] pc, pci, virtio, hotplug fixes, enhancements for 2.1

[Peter Maydell]

On 17 June 2014 18:36, Michael S. Tsirkin <address@hidden> wrote:
> The following changes since commit 50809c8b9288a9bfe1fdec926b7ef985608a7ea6:
>
>   Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging 
> (2014-06-05 23:05:07 +0100)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to 06d746ea91af349148b67a99ae9b765ea24cab1e:
>
>   qmp: add ACPI_DEVICE_OST event handling (2014-06-17 18:31:13 +0300)

This has merge conflicts, at least one of which doesn't have
an obviously trivial resolution. mst has agreed to rebase.

thanks
-- PMM