diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-21 11:09:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-21 11:09:57 -0800 |
| commit | a07a003ce6d475014e71e1c4f52f4ed7146dd35e (patch) | |
| tree | 1c5a75f8b1788a25ac4738bd8c05cd910dc5b047 | |
| parent | a4165ffc835fcf738c2ff41ce8305b04454c07d0 (diff) | |
| parent | 46447367a52965e9d35f112f5b26fc8ff8ec443d (diff) | |
Merge tag 'io_uring-6.18-20251120' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux
Pull io_uring fix from Jens Axboe:
"Just a single fix for a mixup of arguments for the skb_queue_splice()
call, in the io_uring timestamp retrieval code"
* tag 'io_uring-6.18-20251120' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
io_uring/cmd_net: fix wrong argument types for skb_queue_splice()
| -rw-r--r-- | io_uring/cmd_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/io_uring/cmd_net.c b/io_uring/cmd_net.c index 27a09aa4c9d0..3b75931bd569 100644 --- a/io_uring/cmd_net.c +++ b/io_uring/cmd_net.c @@ -127,7 +127,7 @@ static int io_uring_cmd_timestamp(struct socket *sock, if (!unlikely(skb_queue_empty(&list))) { scoped_guard(spinlock_irqsave, &q->lock) - skb_queue_splice(q, &list); + skb_queue_splice(&list, q); } return -EAGAIN; } |