summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPeter Maydell2019-04-08 18:53:18 +0200
committerPeter Maydell2019-04-08 18:53:18 +0200
commit5263724b78f89cdea2354c8e92c53bac1b4641a3 (patch)
tree3a422bbb0f4646b29cf7b8b847408c5a74c4a408 /docs
parentMerge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-04-0... (diff)
parenthmp: Fix drive_add ... format=help crash (diff)
downloadqemu-5263724b78f89cdea2354c8e92c53bac1b4641a3.tar.gz
qemu-5263724b78f89cdea2354c8e92c53bac1b4641a3.tar.xz
qemu-5263724b78f89cdea2354c8e92c53bac1b4641a3.zip
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches: - hmp: Fix drive_add ... format=help crash - block: Forward 'discard' to temporary overlay # gpg: Signature made Mon 08 Apr 2019 16:43:20 BST # gpg: using RSA key 7F09B272C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full] # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: hmp: Fix drive_add ... format=help crash block: Forward 'discard' to temporary overlay Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions