Merge tag 'io_uring-5.9-2020-09-04' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Sep 2020 19:55:22 +0000 (12:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Sep 2020 19:55:22 +0000 (12:55 -0700)
commitd849ca483dba7546ad176da83bf66d1c013725f6
tree68be0644390572caf8244853d9bc220d7f53db08
parent2fb547911ca54bc9ffa2709c55c9a7638ac50ae4
parent355afaeb578abac907217c256a844cfafb0337b2
Merge tag 'io_uring-5.9-2020-09-04' of git://git.kernel.dk/linux-block

Pull io_uring fixes from Jens Axboe:

 - EAGAIN with O_NONBLOCK retry fix

 - Two small fixes for registered files (Jiufei)

* tag 'io_uring-5.9-2020-09-04' of git://git.kernel.dk/linux-block:
  io_uring: no read/write-retry on -EAGAIN error and O_NONBLOCK marked file
  io_uring: set table->files[i] to NULL when io_sqe_file_register failed
  io_uring: fix removing the wrong file in __io_sqe_files_update()
fs/io_uring.c