Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
83ec88d81a
253 changed files with 3144 additions and 1668 deletions
|
|
@ -244,7 +244,7 @@ enum io_uring_op {
|
|||
#define IORING_ASYNC_CANCEL_ANY (1U << 2)
|
||||
|
||||
/*
|
||||
* send/sendmsg and recv/recvmsg flags (sqe->addr2)
|
||||
* send/sendmsg and recv/recvmsg flags (sqe->ioprio)
|
||||
*
|
||||
* IORING_RECVSEND_POLL_FIRST If set, instead of first attempting to send
|
||||
* or receive and arm poll if that yields an
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue