From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jun 2024 21:01:03 +0000 (-0700)
Subject: Merge tag 'io_uring-6.10-20240621' of git://git.kernel.dk/linux
X-Git-Tag: v6.10-rc5~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a502e727965dbd735145cff7ec84ad0a6060f9d2;p=thirdparty%2Fkernel%2Flinux.git

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
---

a502e727965dbd735145cff7ec84ad0a6060f9d2