]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'io_uring-5.8-2020-07-30' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2020 16:47:07 +0000 (09:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2020 16:47:07 +0000 (09:47 -0700)
Pull io_uring fixes from Jens Axboe:
 "Two small fixes for corner/error cases"

* tag 'io_uring-5.8-2020-07-30' of git://git.kernel.dk/linux-block:
  io_uring: fix lockup in io_fail_links()
  io_uring: fix ->work corruption with poll_add


Trivial merge