From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Jun 2020 02:23:13 +0000 (-0700)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: v5.8-rc2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=64677779e8962c20b580b471790fe42367750599;p=users%2Fhch%2Fconfigfs.git

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "One minor fix and two patches reworking the ata dma drain for the
  !CONFIG_LIBATA case. The latter is a 5.7 regression fix"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: Wire up ata_scsi_dma_need_drain for SAS HBA drivers
  scsi: libata: Provide an ata_scsi_dma_need_drain stub for !CONFIG_ATA
  scsi: ufs-bsg: Fix runtime PM imbalance on error
---

64677779e8962c20b580b471790fe42367750599