summary refs log tree commit diff stats
path: root/chardev/char-socket.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-04-12 17:06:49 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-04-12 17:06:49 +0100
commitafccfc0c4c6134a7bc9da6375996b3b91d291de4 (patch)
tree141bdcb90e1cefa32e6e299051774961b9bb7f15 /chardev/char-socket.c
parent13c24edaa742181af8d9c6b027ee366b04de1ea1 (diff)
parent9749636b005d118259810afb92482df2fe0ae2ad (diff)
downloadfocaccia-qemu-afccfc0c4c6134a7bc9da6375996b3b91d291de4.tar.gz
focaccia-qemu-afccfc0c4c6134a7bc9da6375996b3b91d291de4.zip
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:

- iotests fixes

# gpg: Signature made Fri 12 Apr 2019 17:04:09 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:
  iotest: Fix 241 to run in generic directory
  iotests: Let 245 pass on tmpfs

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