diff options
author | Peter Maydell | 2021-03-15 20:23:00 +0100 |
---|---|---|
committer | Peter Maydell | 2021-03-15 20:23:00 +0100 |
commit | 2615a5e433aeb812c300d3a48e1a88e1303e2339 (patch) | |
tree | 3edfb705db68fb72bf6fa634ca08ffd8bd88efe3 /include/net/net.h | |
parent | Merge remote-tracking branch 'remotes/philmd/tags/avr-20210315' into staging (diff) | |
parent | virtio-blk: Respect discard granularity (diff) | |
download | qemu-2615a5e433aeb812c300d3a48e1a88e1303e2339.tar.gz qemu-2615a5e433aeb812c300d3a48e1a88e1303e2339.tar.xz qemu-2615a5e433aeb812c300d3a48e1a88e1303e2339.zip |
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>
Diffstat (limited to 'include/net/net.h')
0 files changed, 0 insertions, 0 deletions