Merge tag 'io_uring-6.18-20251120' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux

a07a003c · Linus Torvalds <[email protected]> · 2025-11-21 11:09:57 -08:00

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()

Commit: a07a003ce6d475014e71e1c4f52f4ed7146dd35e
Parents: a4165ffc · 46447367

Merge commit. Changes below are compared with the first parent: a4165ffc.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
io_uring/cmd_net.c	modified	+1	−1	View file

io_uring/cmd_net.c

View file

diff --git a/io_uring/cmd_net.c b/io_uring/cmd_net.c
index 27a09aa..3b75931 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;
 }