]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'block-5.7-2020-05-29' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 May 2020 20:39:26 +0000 (13:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 May 2020 20:39:26 +0000 (13:39 -0700)
commitf5cbf08a9d2cea2f6dbc98ed080a2320ea91d6a5
tree097600a1b5cbd07b29ed5986ccd90a51c65559dc
parentc358dbffd2bcaa3f674aa684a7b26f4765d898d6
parent0b66882ec21a2e63c84a67fbc06f80fa8d3731c0
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()