tree 860090fc885daab7a42da134dc0e29155f00e7cd
parent a5c6a1f0fe1d182489864b708fa472d0333b39d4
parent b8f1d1e05817f5e5f7517911b55ea13d2c0438a0
author Linus Torvalds <torvalds@linux-foundation.org> 1592706193 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1592706193 -0700
mergetag object b8f1d1e05817f5e5f7517911b55ea13d2c0438a0
 type commit
 tag scsi-fixes
 tagger James Bottomley <James.Bottomley@HansenPartnership.com> 1592674710 -0700
 
 SCSI fixes on 20200620
 
 One minor fix and two patches reworking the ata dma drain for the
 !CONFIG_LIBATA case.  The latter is a regression fix for cc97923a5bcc
 ("block: move dma drain handling to scsi")
 
 Signed-off-by: James E.J. Bottomley <jejb@linux.ibm.com>
 -----BEGIN PGP SIGNATURE-----
 
 iJwEABMIAEQWIQTnYEDbdso9F2cI+arnQslM7pishQUCXu5JliYcamFtZXMuYm90
 dG9tbGV5QGhhbnNlbnBhcnRuZXJzaGlwLmNvbQAKCRDnQslM7pishcWzAP0SdVNo
 4pWvdzaqxBqdoe0UlKygfyDUI2/d2682v9qcsgEA1mfpI6NHbmwAftO63t6kF+ll
 PPNnsJKcjYph5MrJzkk=
 =+54z
 -----END PGP SIGNATURE-----

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