From: Linus Torvalds Date: Fri, 19 Jan 2024 02:17:57 +0000 (-0800) Subject: Merge tag 'for-6.8/io_uring-2024-01-18' of git://git.kernel.dk/linux X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e9a5a78d1ad8ceb4e3df6d6ad93360094c84ac40;p=linux.git Merge tag 'for-6.8/io_uring-2024-01-18' of git://git.kernel.dk/linux Pull io_uring fixes from Jens Axboe: "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" * tag 'for-6.8/io_uring-2024-01-18' of git://git.kernel.dk/linux: io_uring: combine cq_wait_nr checks io_uring: clean *local_work_add var naming io_uring: clean up local tw add-wait sync io_uring: adjust defer tw counting io_uring/register: guard compat syscall with CONFIG_COMPAT io_uring/rsrc: improve code generation for fixed file assignment io_uring/rw: cleanup io_rw_done() --- e9a5a78d1ad8ceb4e3df6d6ad93360094c84ac40