From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 15 Mar 2021 19:23:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into... 
X-Git-Tag: qemu-xen-4.16.0-rc4~287
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2615a5e433aeb812c300d3a48e1a88e1303e2339;p=qemu-xen.git

Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging

Pull request

# gpg: Signature made Mon 15 Mar 2021 09:50:58 GMT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha-gitlab/tags/block-pull-request:
  virtio-blk: Respect discard granularity

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

2615a5e433aeb812c300d3a48e1a88e1303e2339