From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 May 2019 02:10:37 +0000 (-0700)
Subject: Merge tag 'for-linus-20190516' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.2-rc1~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a6a4b66bd8f41922c543f7a820c66ed59c25995e;p=users%2Fhch%2Fmisc.git

Merge tag 'for-linus-20190516' of git://git.kernel.dk/linux-block

Pull io_uring fixes from Jens Axboe:
 "A small set of fixes for io_uring.

  This contains:

   - smp_rmb() cleanup for io_cqring_events() (Jackie)

   - io_cqring_wait() simplification (Jackie)

   - removal of dead 'ev_flags' passing (me)

   - SQ poll CPU affinity verification fix (me)

   - SQ poll wait fix (Roman)

   - SQE command prep cleanup and fix (Stefan)"

* tag 'for-linus-20190516' of git://git.kernel.dk/linux-block:
  io_uring: use wait_event_interruptible for cq_wait conditional wait
  io_uring: adjust smp_rmb inside io_cqring_events
  io_uring: fix infinite wait in khread_park() on io_finish_async()
  io_uring: remove 'ev_flags' argument
  io_uring: fix failure to verify SQ_AFF cpu
  io_uring: fix race condition reading SQE data
---

a6a4b66bd8f41922c543f7a820c66ed59c25995e