From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Nov 2022 22:02:44 +0000 (-0800)
Subject: Merge tag 'io_uring-6.1-2022-11-11' of git://git.kernel.dk/linux
X-Git-Tag: v6.6.17~6194
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e6b2b2e4f30c29caf89ecfa9ed4d9f97d151102;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'io_uring-6.1-2022-11-11' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:
 "Nothing major, just a few minor tweaks:

   - Tweak for the TCP zero-copy io_uring self test (Pavel)

   - Rather than use our internal cached value of number of CQ events
     available, use what the user can see (Dylan)

   - Fix a typo in a comment, added in this release (me)

   - Don't allow wrapping while adding provided buffers (me)

   - Fix a double poll race, and add a lockdep assertion for it too
     (Pavel)"

* tag 'io_uring-6.1-2022-11-11' of git://git.kernel.dk/linux:
  io_uring/poll: lockdep annote io_poll_req_insert_locked
  io_uring/poll: fix double poll req->flags races
  io_uring: check for rollover of buffer ID when providing buffers
  io_uring: calculate CQEs from the user visible value
  io_uring: fix typo in io_uring.h comment
  selftests/net: don't tests batched TCP io_uring zc
---

4e6b2b2e4f30c29caf89ecfa9ed4d9f97d151102