]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'sstabellini/tags/xen-20161128-tag' into staging
authorStefan Hajnoczi <stefanha@redhat.com>
Tue, 29 Nov 2016 09:28:51 +0000 (09:28 +0000)
committerStefan Hajnoczi <stefanha@redhat.com>
Tue, 29 Nov 2016 09:28:51 +0000 (09:28 +0000)
Xen 2016/11/28

# gpg: Signature made Mon 28 Nov 2016 07:37:33 PM GMT
# gpg:                using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <sstabellini@kernel.org>"
# gpg:                 aka "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90

* sstabellini/tags/xen-20161128-tag:
  xen: ignore direction in bufioreq handling
  xen: slightly simplify bufioreq handling
  xen: fix quad word bufioreq handling
  xen_disk: split discard input to match internal representation

Message-id: alpine.DEB.2.10.1611281137590.21858@sstabellini-ThinkPad-X260
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Trivial merge