From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 May 2020 20:39:26 +0000 (-0700)
Subject: Merge tag 'block-5.7-2020-05-29' of git://git.kernel.dk/linux-block
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=75574f1212a7b4833367ad56626c30e64a94aa18;p=linux.git

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

Pull block fixes from Jens Axboe:
 "Two small fixes:

   - Revert a block change that mixed up the return values for non-mq
     devices

   - NVMe poll race fix"

* tag 'block-5.7-2020-05-29' of git://git.kernel.dk/linux-block:
  Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
  nvme-pci: avoid race between nvme_reap_pending_cqes() and nvme_poll()
---

75574f1212a7b4833367ad56626c30e64a94aa18