History

Merge tag 'for-6.8/io_uring-2024-01-08' of git://git.kernel.dk/linux

Pull io_uring updates from Jens Axboe: "Mostly just come fixes and cleanups, but one feature as well. In detail: - Harden the check for handling IOPOLL based on return (Pavel) - Various minor optimizations (Pavel) - Drop remnants of SCM_RIGHTS fd passing support, now that it's no longer supported since 6.7 (me) - Fix for a case where bytes_done wasn't initialized properly on a failure condition for read/write requests (me) - Move the register related code to a separate file (me) - Add support for returning the provided ring buffer head (me) - Add support for adding a direct descriptor to the normal file table (me, Christian Brauner) - Fix for ensuring pending task_work for a ring with DEFER_TASKRUN is run even if we timeout waiting (me)" * tag 'for-6.8/io_uring-2024-01-08' of git://git.kernel.dk/linux: io_uring: ensure local task_work is run on wait timeout io_uring/kbuf: add method for returning provided buffer ring head io_uring/rw: ensure io->bytes_done is always initialized io_uring: drop any code related to SCM_RIGHTS io_uring/unix: drop usage of io_uring socket io_uring/register: move io_uring_register(2) related code to register.c io_uring/openclose: add support for IORING_OP_FIXED_FD_INSTALL io_uring/cmd: inline io_uring_cmd_get_task io_uring/cmd: inline io_uring_cmd_do_in_task_lazy io_uring: split out cmd api into a separate header io_uring: optimise ltimeout for inline execution io_uring: don't check iopoll if request completes

Linus Torvalds committed 2 years ago

Commit 4c72e2b2 parents 01d550f 6ff140726 files · +890 −947Browse files

Showing the changes to security (2 of 26 files). Show all

Unified · Split

2 files
  1. security/selinux/hooks.c +1 −1
  2. security/smack/smack_lsm.c +1 −1
security/selinux/hooks.c+1−1
@@ -92,7 +92,7 @@ · 91 unmodified lines
92#include <uapi/linux/mount.h>92#include <uapi/linux/mount.h>
93#include <linux/fsnotify.h>93#include <linux/fsnotify.h>
94#include <linux/fanotify.h>94#include <linux/fanotify.h>
95#include <linux/io_uring.h>95#include <linux/io_uring/cmd.h>
96#include <uapi/linux/lsm.h>96#include <uapi/linux/lsm.h>
97 97
98#include "avc.h"98#include "avc.h"
security/smack/smack_lsm.c+1−1
@@ -43,7 +43,7 @@ · 42 unmodified lines
43#include <linux/fs_context.h>43#include <linux/fs_context.h>
44#include <linux/fs_parser.h>44#include <linux/fs_parser.h>
45#include <linux/watch_queue.h>45#include <linux/watch_queue.h>
46#include <linux/io_uring.h>46#include <linux/io_uring/cmd.h>
47#include <uapi/linux/lsm.h>47#include <uapi/linux/lsm.h>
48#include "smack.h"48#include "smack.h"
49 49

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t