From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 8 Apr 2020 14:46:35 +0000 (-0600)
Subject: Merge branch 'zbd-build' of https://github.com/vincentkfu/fio
X-Git-Tag: fio-3.20~36
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3f2dcb7f855d43244ec178aa2a34bb1475bf6901;p=fio.git

Merge branch 'zbd-build' of https://github.com/vincentkfu/fio

* 'zbd-build' of https://github.com/vincentkfu/fio:
  Revert ".travis.yml: remove pip line from xcode11.2 config"
  zbd: fix Windows build errors
---

3f2dcb7f855d43244ec178aa2a34bb1475bf6901