Merge branch 'master' of https://github.com/DevriesL/fio
authorJens Axboe <axboe@kernel.dk>
Tue, 9 Mar 2021 14:58:39 +0000 (07:58 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 9 Mar 2021 14:58:39 +0000 (07:58 -0700)
* 'master' of https://github.com/DevriesL/fio:
  engines/io_uring: fix compilation conflict with Android NDK


Trivial merge