aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-03-27 16:56:31 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-03-27 16:56:31 +0100
commit9366f53d509ae31bf7acb33e2eb7804e16fe70d4 (patch)
treeec062c974fedac72f5fdf3865e7e87db8df47fe6 /include
parenta001631cb8eef07654e0ca508dd24f448e0fd936 (diff)
parent700f9ce0f9f49675818ac95c8953cbc65aa1d112 (diff)
downloadqemu-9366f53d509ae31bf7acb33e2eb7804e16fe70d4.zip
qemu-9366f53d509ae31bf7acb33e2eb7804e16fe70d4.tar.gz
qemu-9366f53d509ae31bf7acb33e2eb7804e16fe70d4.tar.bz2
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-03-27' into staging
Block patches for 2.9-rc2. # gpg: Signature made Mon 27 Mar 2017 16:47:54 BST # gpg: using RSA key 0xF407DB0061D5CF40 # gpg: Good signature from "Max Reitz <mreitz@redhat.com>" # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40 * remotes/maxreitz/tags/pull-block-2017-03-27: block/file-posix.c: Fix unused variable warning on OpenBSD file-posix: Make bdrv_flush() failure permanent without O_DIRECT nbd-client: fix handling of hungup connections qemu-img: print short help on getopt failure qemu-img: fix switch indentation in img_amend() qemu-img: show help for invalid global options Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions