Merge branch 'io_uring-5.7' into async-buffered
authorJens Axboe <axboe@kernel.dk>
Fri, 22 May 2020 15:51:28 +0000 (09:51 -0600)
committerJens Axboe <axboe@kernel.dk>
Fri, 22 May 2020 15:51:28 +0000 (09:51 -0600)
commita34b83dc3788f3fbd7f40e4c6f7fc399ada328f3
tree2d5aea441ba3dfe365014b3a102f8d3134ff852f
parent37fad13e54d1d8c2b353df3275d7190feeea4b50
parentd4ae271dfaae2a5f41c015f2f20d62a1deeec734
Merge branch 'io_uring-5.7' into async-buffered

* io_uring-5.7:
  io_uring: reset -EBUSY error when io sq thread is waken up
  io_uring: don't add non-IO requests to iopoll pending list
  io_uring: don't use kiocb.private to store buf_index
  io_uring: cancel work if task_work_add() fails
  io_uring: remove dead check in io_splice()
  io_uring: fix FORCE_ASYNC req preparation
  io_uring: don't prepare DRAIN reqs twice
  io_uring: initialize ctx->sqo_wait earlier
fs/io_uring.c