[Qemu-devel] [PULL 0/6] tpm, vhost, virtio: fixes for 2.6

[Michael S. Tsirkin]

The following changes since commit d44122ecd0fa62d20762bdd8f214f077cb8e011b:

  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 
(2016-04-12 17:47:15 +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 01310e2aa7ad87f101d56feb8c06898084c9b542:

  hw/virtio/balloon: Replace TARGET_PAGE_SIZE with BALLOON_PAGE_SIZE 
(2016-04-14 16:44:42 +0300)

----------------------------------------------------------------
tpm, vhost, virtio: fixes for 2.6

Minor fixes all over the place.

Signed-off-by: Michael S. Tsirkin <address@hidden>

----------------------------------------------------------------
Igor Mammedov (2):
      pc: acpi: tpm: add missing MMIO resource to PCI0._CRS
      tpm: acpi: remove IRQ from TPM's CRS to make Windows not see conflict

Marc-André Lureau (2):
      specs/vhost-user: improve VHOST_SET_VRING_NUM documentation
      specs/vhost-user: spelling fix

Stefan Berger (1):
      tpm: Fix write to file descriptor function

Thomas Huth (1):
      hw/virtio/balloon: Replace TARGET_PAGE_SIZE with BALLOON_PAGE_SIZE

 hw/i386/acpi-build.c       | 12 +++++++++++-
 hw/tpm/tpm_passthrough.c   |  2 +-
 hw/virtio/virtio-balloon.c |  5 +++--
 docs/specs/vhost-user.txt  |  4 ++--
 4 files changed, 17 insertions(+), 6 deletions(-)