From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Aug 2024 21:18:31 +0000 (-0700)
Subject: Merge tag 'io_uring-6.11-20240802' of git://git.kernel.dk/linux
X-Git-Tag: v6.11-rc2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17712b7ea0756799635ba159cc773082230ed028;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'io_uring-6.11-20240802' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:
 "Two minor tweaks for the NAPI handling, both from Olivier:

   - Kill two unused list definitions

   - Ensure that multishot NAPI doesn't age away"

* tag 'io_uring-6.11-20240802' of git://git.kernel.dk/linux:
  io_uring: remove unused local list heads in NAPI functions
  io_uring: keep multishot request NAPI timeout current
---

17712b7ea0756799635ba159cc773082230ed028