From: Peter Maydell Date: Sun, 7 Apr 2019 13:54:55 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Tag: qemu-xen-4.13.0-rc1~242 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f55a585d1037e5de6088f25e75443c2776786e29;p=qemu-xen.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging pci, pc, virtio: fixes intel-iommu fixes virtio typo fixes linker: a couple of asserts for consistency/security Signed-off-by: Michael S. Tsirkin # gpg: Signature made Tue 02 Apr 2019 16:51:19 BST # gpg: using RSA key 281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin " [full] # gpg: aka "Michael S. Tsirkin " [full] # 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: intel_iommu: Drop extended root field intel_iommu: Fix root_scalable migration breakage virtio-net: Fix typo in comment intel_iommu: Correct caching-mode error message acpi: verify file entries in bios_linker_loader_add_pointer() Signed-off-by: Peter Maydell --- f55a585d1037e5de6088f25e75443c2776786e29