Merge tag 'io_uring-5.13-2021-06-12' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Jun 2021 18:53:20 +0000 (11:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Jun 2021 18:53:20 +0000 (11:53 -0700)
commitb2568eeb961c1bb79ada9c2b90f65f625054adaf
treef4448711c8c87e6762bf659c12b94af850997d3a
parent99f925947ab0fd5c17b74460d8b32f1aa1c86e3a
parent9690557e22d63f13534fd167d293ac8ed8b104f9
Merge tag 'io_uring-5.13-2021-06-12' of git://git.kernel.dk/linux-block

Pull io_uring fixes from Jens Axboe:
 "Just an API change for the registration changes that went into this
  release. Better to get it sorted out now than before it's too late"

* tag 'io_uring-5.13-2021-06-12' of git://git.kernel.dk/linux-block:
  io_uring: add feature flag for rsrc tags
  io_uring: change registration/upd/rsrc tagging ABI