The following changes since commit ea2afcf5b6727a577cf561fd8fe0d8c397ecc927:

  Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2017-03-24 14:14:18 +0000)

are available in the git repository at:

  git://github.com/XanClic/qemu.git tags/pull-block-2017-03-27

for you to fetch changes up to 700f9ce0f9f49675818ac95c8953cbc65aa1d112:

  block/file-posix.c: Fix unused variable warning on OpenBSD (2017-03-27 17:28:34 +0200)

----------------------------------------------------------------
Block patches for 2.9-rc2.

----------------------------------------------------------------
Hi Peter,

This pull request contains your build fix for OpenBSD on top so you can
just drop it if you have merged it yourself already.


Thanks,

Max

----------------------------------------------------------------
Kevin Wolf (1):
      file-posix: Make bdrv_flush() failure permanent without O_DIRECT

Paolo Bonzini (1):
      nbd-client: fix handling of hungup connections

Peter Maydell (1):
      block/file-posix.c: Fix unused variable warning on OpenBSD

Stefan Hajnoczi (3):
      qemu-img: show help for invalid global options
      qemu-img: fix switch indentation in img_amend()
      qemu-img: print short help on getopt failure

 block/file-posix.c |  50 ++++++++++----
 block/nbd-client.c |  12 ++--
 nbd/client.c       |   2 +-
 qemu-img.c         | 196 +++++++++++++++++++++++++++++++++++++----------------
 4 files changed, 180 insertions(+), 80 deletions(-)

-- 
2.12.1

On 27 March 2017 at 16:52, Max Reitz <mreitz@redhat.com> wrote:
> The following changes since commit ea2afcf5b6727a577cf561fd8fe0d8c397ecc927:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2017-03-24 14:14:18 +0000)
>
> are available in the git repository at:
>
>   git://github.com/XanClic/qemu.git tags/pull-block-2017-03-27
>
> for you to fetch changes up to 700f9ce0f9f49675818ac95c8953cbc65aa1d112:
>
>   block/file-posix.c: Fix unused variable warning on OpenBSD (2017-03-27 17:28:34 +0200)
>
> ----------------------------------------------------------------
> Block patches for 2.9-rc2.
>
> ----------------------------------------------------------------
> Hi Peter,
>
> This pull request contains your build fix for OpenBSD on top so you can
> just drop it if you have merged it yourself already.

I can't take partial pullrequests like that, because the thing you
have signed is the tag at the top of the branch, not the commit
before it. However, git merge will happily handle the branch
containing a commit that's been merged already via some other
route, so that's no problem.

(In this case I hadn't actually merged the buildfix.)

Applied to master.

thanks
-- PMM