From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Jun 2023 00:32:34 +0000 (-0700)
Subject: Merge tag 'io_uring-6.4-2023-06-21' of git://git.kernel.dk/linux
X-Git-Tag: v6.6.17~4663
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c213de632f7ae293409051733d24c7c6afc15292;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'io_uring-6.4-2023-06-21' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:
 "A fix for a race condition with poll removal and linked timeouts, and
  then a few followup fixes/tweaks for the msg_control patch from last
  week.

  Not super important, particularly the sparse fixup, as it was broken
  before that recent commit. But let's get it sorted for real for this
  release, rather than just have it broken a bit differently"

* tag 'io_uring-6.4-2023-06-21' of git://git.kernel.dk/linux:
  io_uring/net: use the correct msghdr union member in io_sendmsg_copy_hdr
  io_uring/net: disable partial retries for recvmsg with cmsg
  io_uring/net: clear msg_controllen on partial sendmsg retry
  io_uring/poll: serialize poll linked timer start with poll removal
---

c213de632f7ae293409051733d24c7c6afc15292