Commit a07a003c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents a4165ffc 46447367

io_uring/cmd_net.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}