[GIT PULL] Follow up io_uring pull for 6.0-rc6

[GIT PULL] Follow up io_uring pull for 6.0-rc6

[Jens Axboe]

Hi Linus,

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)

Please pull!


The following changes since commit fc7222c3a9f56271fba02aabbfbae999042f1679:

  io_uring/msg_ring: check file type before putting (2022-09-15 11:44:35 -0600)

are available in the Git repository at:

  git://git.kernel.dk/linux.git tags/io_uring-6.0-2022-09-18

for you to fetch changes up to 9bd3f728223ebcfef8e9d087bdd142f0e388215d:

  io_uring/opdef: rename SENDZC_NOTIF to SEND_ZC (2022-09-18 06:59:13 -0600)

----------------------------------------------------------------
io_uring-6.0-2022-09-18

----------------------------------------------------------------
Pavel Begunkov (1):
      io_uring/net: fix zc fixed buf lifetime

Stefan Metzmacher (1):
      io_uring/opdef: rename SENDZC_NOTIF to SEND_ZC

 io_uring/net.c   | 16 ++++++++--------
 io_uring/opdef.c |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

-- 
Jens Axboe

Re: [GIT PULL] Follow up io_uring pull for 6.0-rc6

[pr-tracker-bot]

The pull request you sent on Sun, 18 Sep 2022 07:03:30 -0600:

> git://git.kernel.dk/linux.git tags/io_uring-6.0-2022-09-18

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/38eddeedbbeac33f26845c29e7414b9313ea70db

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html