summary refs log tree commit diff stats
path: root/qemu-img.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-01-29 10:10:43 +0000
committerPeter Maydell <peter.maydell@linaro.org>2021-01-29 10:10:43 +0000
commit5101d00d2f1138a73344dc4833587f76d7a5fa5c (patch)
treea981291ca7b48519da6d12632e066179f927e79c /qemu-img.c
parent7e7eb9f852a46b51a71ae9d82590b2e4d28827ee (diff)
parent77182df19f874adfc4ac98248606c154764baaa8 (diff)
downloadfocaccia-qemu-5101d00d2f1138a73344dc4833587f76d7a5fa5c.tar.gz
focaccia-qemu-5101d00d2f1138a73344dc4833587f76d7a5fa5c.zip
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.0-pull-request' into staging
Trivial patches 20210129

# gpg: Signature made Fri 29 Jan 2021 08:32:17 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-for-6.0-pull-request:
  target/rx: Fix compiler errors for build with sanitizers
  net/slirp.c: Fix spelling error in error message
  tcg/tci: Restrict tci_write_reg16() to 64-bit hosts
  MAINTAINERS: Update 9pfs tree URL

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-img.c')
0 files changed, 0 insertions, 0 deletions