Re: [Qemu-devel] [PULL v2 0/9] pc, virtio, misc bugfixes

[Peter Maydell]

On 22 October 2014 09:18, Michael S. Tsirkin <address@hidden> wrote:
> The following changes since commit 5f77ef69a195098baddfdc6d189f1b4a94587378:
>
>   glib: add compatibility interface for g_strcmp0() (2014-10-16 23:02:31 
> +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 8b4c5b49268123687334d5753128f4cb78d7f88c:
>
>   tests: fix rebuild-expected-aml.sh for acpi-test rename (2014-10-22 
> 11:16:13 +0300)
>
> ----------------------------------------------------------------
> pc, virtio, misc bugfixes
>
> A bunch of minor bugfixes all over the place.
>
> changes from v1:
>     fix for test re-generation script
>     add missing acks to two patches
>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
>
> ----------------------------------------------------------------


Hi. I'm afraid this has a merge conflict in include/hw/i386/pc.h
which I don't understand well enough to fix. Could you rebase and
resend, please?

thanks
-- PMM