]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170920-tag' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 21 Sep 2017 09:18:02 +0000 (10:18 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 21 Sep 2017 09:18:02 +0000 (10:18 +0100)
Xen 2017/09/20

# gpg: Signature made Thu 21 Sep 2017 03:20:02 BST
# gpg:                using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# gpg:                 aka "Stefano Stabellini <sstabellini@kernel.org>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90

* remotes/sstabellini/tags/xen-20170920-tag:
  xen/pt: allow QEMU to request MSI unmasking at bind time
  xen-disk: use g_new0 to fix build

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

Trivial merge