summary refs log tree commit diff stats
path: root/stubs/error-printf.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-07-23 18:37:39 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-07-23 18:37:39 +0100
commit5c29b203df6dc2416bffaee11d49f12b76662420 (patch)
treea62f54dd08299904c309f9208f75b07977e50ee3 /stubs/error-printf.c
parente596be90393389405c96a5c9534c4c4e2e0b5675 (diff)
parent3e31b4e17064d22e533071aaa57d3f01499ef910 (diff)
downloadfocaccia-qemu-5c29b203df6dc2416bffaee11d49f12b76662420.tar.gz
focaccia-qemu-5c29b203df6dc2416bffaee11d49f12b76662420.zip
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:

- vvfat: Disable debug message by default
- qemu-iotests fixes
- Fix typos in comments

# gpg: Signature made Mon 23 Jul 2018 17:44:40 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  block/vvfat: Disable debug message by default
  iotests: Disallow compat=0.10 in 223
  iotest: Fix filtering order in 226
  iotests: remove LUKS support from test 226
  qemu-img: avoid overflow of min_sparse parameter
  block: Fix typos in comments (found by codespell)
  qemu-iotests: Use host_device instead of file in 149

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