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

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

Pull io_uring fixes from Jens Axboe:

 - Fix a comment in the uapi header using the wrong member name (Caleb)

 - Fix KCSAN warning for a debug check in sqpoll (me)

 - Two more NAPI tweaks (Olivier)

* tag 'io_uring-6.11-20240824' of git://git.kernel.dk/linux:
  io_uring: fix user_data field name in comment
  io_uring/sqpoll: annotate debug task == current with data_race()
  io_uring/napi: remove duplicate io_napi_entry timeout assignation
  io_uring/napi: check napi_enabled in io_napi_add() before proceeding
---

c5ac744cdddae82916d4cd35d962d3f47065e68a