From: Peter Maydell Date: Mon, 27 Mar 2017 15:56:31 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-03-27' into staging X-Git-Tag: v2.9.0-rc2~9 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9366f53d509ae31bf7acb33e2eb7804e16fe70d4;p=mirror_qemu.git 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 " # 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 --- 9366f53d509ae31bf7acb33e2eb7804e16fe70d4