[GIT,PULL] Followup io_uring fixes for 6.8-rc1

Pull-request

git://git.kernel.dk/linux.git tags/for-6.8/io_uring-2024-01-18

Message

Jens Axboe Jan. 18, 2024, 10:05 p.m. UTC

Hi Linus,

Nothing major in here, just a few fixes and cleanups that arrived after
the initial merge window pull request got finalized, as well as a fix
for a patch that got merged earlier.

Please pull!

https://www.wikihow.com/Live-off-the-Grid

The following changes since commit 6ff1407e24e6fdfa4a16ba9ba551e3d253a26391:

  io_uring: ensure local task_work is run on wait timeout (2024-01-04 12:21:08 -0700)

are available in the Git repository at:

  git://git.kernel.dk/linux.git tags/for-6.8/io_uring-2024-01-18

for you to fetch changes up to b4bc35cf8704db86203c0739711dab1804265bf3:

  io_uring: combine cq_wait_nr checks (2024-01-17 09:45:24 -0700)

----------------------------------------------------------------
for-6.8/io_uring-2024-01-18

----------------------------------------------------------------
Jens Axboe (3):
      io_uring/rw: cleanup io_rw_done()
      io_uring/rsrc: improve code generation for fixed file assignment
      io_uring/register: guard compat syscall with CONFIG_COMPAT

Pavel Begunkov (4):
      io_uring: adjust defer tw counting
      io_uring: clean up local tw add-wait sync
      io_uring: clean *local_work_add var naming
      io_uring: combine cq_wait_nr checks

 io_uring/io_uring.c | 63 ++++++++++++++++++++++++++++++++++++++---------------
 io_uring/register.c |  8 ++++---
 io_uring/rsrc.h     | 14 +++++++-----
 io_uring/rw.c       | 48 ++++++++++++++++++++++------------------
 4 files changed, 86 insertions(+), 47 deletions(-)

Comments

[e-mail] Jan. 19, 2024, 2:40 a.m. UTC | #1

The pull request you sent on Thu, 18 Jan 2024 15:05:26 -0700:

> git://git.kernel.dk/linux.git tags/for-6.8/io_uring-2024-01-18

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

Thank you!