From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Sep 2020 19:55:22 +0000 (-0700)
Subject: Merge tag 'io_uring-5.9-2020-09-04' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.15~2962
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d849ca483dba7546ad176da83bf66d1c013725f6;p=platform%2Fkernel%2Flinux-starfive.git

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()
---

d849ca483dba7546ad176da83bf66d1c013725f6