Merge tag 'io_uring-6.10-20240621' of git://git.kernel.dk/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jun 2024 21:01:03 +0000 (14:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jun 2024 21:01:03 +0000 (14:01 -0700)
commita502e727965dbd735145cff7ec84ad0a6060f9d2
tree6d30cb3ed16d83bed99740a5d113cfce2a74ac06
parentffdf504cab55743ad55961afae41ad4a079e74bb
parenta23800f08a60787dfbf2b87b2e6ed411cb629859
Merge tag 'io_uring-6.10-20240621' of git://git.kernel.dk/linux

Pull io_uring fix from Jens Axboe:
 "Just a single cleanup for the fixed buffer iov_iter import.

  More cosmetic than anything else, but let's get it cleaned up as it's
  confusing"

* tag 'io_uring-6.10-20240621' of git://git.kernel.dk/linux:
  io_uring/rsrc: fix incorrect assignment of iter->nr_segs in io_import_fixed