From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 May 2020 18:12:30 +0000 (-0700)
Subject: Merge tag 'io_uring-5.7-2020-05-22' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.15~3841
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=444565650a5fe9c63ddf153e6198e31705dedeb2;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'io_uring-5.7-2020-05-22' of git://git.kernel.dk/linux-block

Pull io_uring fixes from Jens Axboe:
 "A small collection of small fixes that should go into this release:

   - Two fixes for async request preparation (Pavel)

   - Busy clear fix for SQPOLL (Xiaoguang)

   - Don't use kiocb->private for O_DIRECT buf index, some file systems
     use it (Bijan)

   - Kill dead check in io_splice()

   - Ensure sqo_wait is initialized early

   - Cancel task_work if we fail adding to original process

   - Only add (IO)pollable requests to iopoll list, fixing a regression
     in this merge window"

* tag 'io_uring-5.7-2020-05-22' of git://git.kernel.dk/linux-block:
  io_uring: reset -EBUSY error when io sq thread is waken up
  io_uring: don't add non-IO requests to iopoll pending list
  io_uring: don't use kiocb.private to store buf_index
  io_uring: cancel work if task_work_add() fails
  io_uring: remove dead check in io_splice()
  io_uring: fix FORCE_ASYNC req preparation
  io_uring: don't prepare DRAIN reqs twice
  io_uring: initialize ctx->sqo_wait earlier
---

444565650a5fe9c63ddf153e6198e31705dedeb2