From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Aug 2021 15:06:26 +0000 (-0700)
Subject: Merge tag 'io_uring-5.14-2021-08-20' of git://git.kernel.dk/linux-block
X-Git-Tag: accepted/tizen/unified/20230118.172025~6631
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e6907d58cf03fc808009681b8ef178affbf96aa;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'io_uring-5.14-2021-08-20' of git://git.kernel.dk/linux-block

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

   - Fix never re-assigning an initial error value for io_uring_enter()
     for SQPOLL, if asked to do nothing

   - Fix xa_alloc_cycle() return value checking, for cases where we have
     wrapped around

   - Fix for a ctx pin issue introduced in this cycle (Pavel)"

* tag 'io_uring-5.14-2021-08-20' of git://git.kernel.dk/linux-block:
  io_uring: fix xa_alloc_cycle() error return value check
  io_uring: pin ctx on fallback execution
  io_uring: only assign io_uring_enter() SQPOLL error in actual error case
---

1e6907d58cf03fc808009681b8ef178affbf96aa