From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 May 2025 16:26:46 +0000 (-0700)
Subject: Merge tag 'io_uring-6.15-20250509' of git://git.kernel.dk/linux
X-Git-Tag: v6.15-rc6~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7380c60b2831220ca6d60d1560ecf8d9bdf06288;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'io_uring-6.15-20250509' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:

 - Fix for linked timeouts arming and firing wrt prep and issue of the
   request being managed by the linked timeout

 - Fix for a CQE ordering issue between requests with multishot and
   using the same buffer group. This is a dumbed down version for this
   release and for stable, it'll get improved for v6.16

 - Tweak the SQPOLL submit batch size. A previous commit made SQPOLL
   manage its own task_work and chose a tiny batch size, bump it from 8
   to 32 to fix a performance regression due to that

* tag 'io_uring-6.15-20250509' of git://git.kernel.dk/linux:
  io_uring/sqpoll: Increase task_work submission batch size
  io_uring: ensure deferred completions are flushed for multishot
  io_uring: always arm linked timeouts prior to issue
---

7380c60b2831220ca6d60d1560ecf8d9bdf06288