summary refs log tree commit diff stats
path: root/hw/misc/mst_fpga.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-04-04 14:00:07 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-04-04 14:00:07 +0100
commitfd69ad866b62ca8ed4337ffee83b6d82a4e99282 (patch)
treee4f79a4b282a69d09f28ed79ee7305b1d83f1da4 /hw/misc/mst_fpga.c
parente5efa1f5f2d32cbfbf18ba84300736503985b593 (diff)
parent9c1386d3ff76c5983529884e3d8420df958c5a29 (diff)
downloadfocaccia-qemu-fd69ad866b62ca8ed4337ffee83b6d82a4e99282.tar.gz
focaccia-qemu-fd69ad866b62ca8ed4337ffee83b6d82a4e99282.zip
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches

# gpg: Signature made Tue 03 Apr 2018 16:48:53 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:
  iotests: Test abnormally large size in compressed cluster descriptor
  qemu-iotests: Use ppc64 qemu_arch on ppc64le host
  iotests: Test preallocated truncate of 2G image
  block/file-posix: Fix fully preallocated truncate
  iotests: fix 208 for luks format
  iotests: Update 186 after commit ac64273c66ab136c44043259162
  iotests: Update 051 and 186 after commit 1454509726719e0933c
  block: handle invalid lseek returns gracefully
  gluster: Fix blockdev-add with server.N.type=unix

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