Merge tag 'io_uring-5.7-2020-05-15' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 May 2020 20:17:41 +0000 (13:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 May 2020 20:17:41 +0000 (13:17 -0700)
commit18e70f3a7651b420bf5d8ce0a3fd3d1cd9e5b689
tree18f106cc58902b4422736ca38a04022688121534
parent12bf0b632ed090358cbf03e323e5342212d0b2e4
parent9d9e88a24c1f20ebfc2f28b1762ce78c0b9e1cb3
Merge tag 'io_uring-5.7-2020-05-15' of git://git.kernel.dk/linux-block

Pull io_uring fixes from Jens Axboe:
 "Two small fixes that should go into this release:

   - Check and handle zero length splice (Pavel)

   - Fix a regression in this merge window for fixed files used with
     polled block IO"

* tag 'io_uring-5.7-2020-05-15' of git://git.kernel.dk/linux-block:
  io_uring: polled fixed file must go through free iteration
  io_uring: fix zero len do_splice()