On Fri, 18 Sep 2020 at 16:05, Michael S. Tsirkin <m...@redhat.com> wrote: > > The following changes since commit 8ee612722dc08830761516e761dde934c3753a14: > > Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20200915' > into staging (2020-09-16 14:47:50 +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 4c67a4c6b399c8fadacb0a0b542d6372fd4092f5: > > virtio-iommu-pci: force virtio version 1 (2020-09-18 10:58:09 -0400) > > ---------------------------------------------------------------- > virtio,pc,acpi: fixes, tests > > Fixes and tests all over the place. > Batch iommu updates for vdpa. > Removal of deprecated cpu hotplug commands. > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > > ----------------------------------------------------------------
Conflict in hw/i386/pc.c -- can you fix up and resend, please? thanks -- PMM
