Merge branch 'master' of https://github.com/bvanassche/fio
authorJens Axboe <axboe@kernel.dk>
Fri, 22 Oct 2021 16:19:04 +0000 (10:19 -0600)
committerJens Axboe <axboe@kernel.dk>
Fri, 22 Oct 2021 16:19:04 +0000 (10:19 -0600)
commit515418094c61cf135513a34651af6134a8794b5d
tree8034d3e76995d51f648bdfff027db944ab8b8171
parent09d0a62931df0bb7ed4ae92b83a245e35d04100a
parentd2257a2729a23c7b1f8b92c2ac7f0a0041d38f69
Merge branch 'master' of https://github.com/bvanassche/fio

* 'master' of https://github.com/bvanassche/fio:
  Android: Add io_uring support