From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 13 Jun 2017 10:14:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Tag: v2.11.1~483
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8e3cf49c47064da19f4bfb1c5bf16e6e613f1bfa;p=mirror_qemu.git

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc, pci, vhost: fixes

Some fixes all over the place.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 08 Jun 2017 20:04:24 BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  hw/pcie: fix the generic pcie root port to support migration
  nvdimm acpi: fix region format interface code
  vhost-user-bridge: fix iov_restore_front() warning

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

8e3cf49c47064da19f4bfb1c5bf16e6e613f1bfa