From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 18 Sep 2022 16:25:27 +0000 (-0700)
Subject: Merge tag 'io_uring-6.0-2022-09-18' of git://git.kernel.dk/linux
X-Git-Tag: v6.0-rc6~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=38eddeedbbeac33f26845c29e7414b9313ea70db;p=linux-block.git

Merge tag 'io_uring-6.0-2022-09-18' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:
 "Nothing really major here, but figured it'd be nicer to just get these
  flushed out for -rc6 so that the 6.1 branch will have them as well.
  That'll make our lives easier going forward in terms of development,
  and avoid trivial conflicts in this area.

   - Simple trace rename so that the returned opcode name is consistent
     with the enum definition (Stefan)

   - Send zc rsrc request vs notification lifetime fix (Pavel)"

* tag 'io_uring-6.0-2022-09-18' of git://git.kernel.dk/linux:
  io_uring/opdef: rename SENDZC_NOTIF to SEND_ZC
  io_uring/net: fix zc fixed buf lifetime
---

38eddeedbbeac33f26845c29e7414b9313ea70db