[GIT,PULL] io_uring fixes for 6.11-rc4

Pull-request

git://git.kernel.dk/linux.git tags/io_uring-6.11-20240824

Message

Jens Axboe Aug. 16, 2024, 7 p.m. UTC

Hi Linus,

A few fixes and cleanups that should go into this release:

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

Please pull!


The following changes since commit 8fe8ac24adcd76b12edbfdefa078567bfff117d4:

  io_uring/net: don't pick multiple buffers for non-bundle send (2024-08-07 15:20:52 -0600)

are available in the Git repository at:

  git://git.kernel.dk/linux.git tags/io_uring-6.11-20240824

for you to fetch changes up to 1fc2ac428ef7d2ab9e8e19efe7ec3e58aea51bf3:

  io_uring: fix user_data field name in comment (2024-08-16 12:31:26 -0600)

----------------------------------------------------------------
io_uring-6.11-20240824

----------------------------------------------------------------
Caleb Sander Mateos (1):
      io_uring: fix user_data field name in comment

Jens Axboe (1):
      io_uring/sqpoll: annotate debug task == current with data_race()

Olivier Langlois (2):
      io_uring/napi: check napi_enabled in io_napi_add() before proceeding
      io_uring/napi: remove duplicate io_napi_entry timeout assignation

 include/uapi/linux/io_uring.h | 2 +-
 io_uring/napi.c               | 3 +--
 io_uring/napi.h               | 2 +-
 io_uring/sqpoll.c             | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

Comments

[e-mail] Aug. 16, 2024, 9:07 p.m. UTC | #1

The pull request you sent on Fri, 16 Aug 2024 13:00:38 -0600:

> git://git.kernel.dk/linux.git tags/io_uring-6.11-20240824

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/c5ac744cdddae82916d4cd35d962d3f47065e68a

Thank you!