Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 May 2018 15:40:17 +0000 (05:40 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 May 2018 15:40:17 +0000 (05:40 -1000)
commit036db8bd96374c66424f270f3370ddaf0adf7506
tree4626eda23fbef952138c828df2bd86291075c1d6
parent93a0d34024ad9951a7ce86a306c8d3414b1b1d88
parent0d74d872c3f8b9cb3d096fb932a063b43b37f188
Merge branch 'for-4.17-fixes' of git://git./linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
 "An earlier commit to add reset control for embedded ahci controllers
  affected some of the hardware specific drivers and got reverted for
  now.

  Other than that, just per-device workarounds and trivial changes"

* 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  driver core: add __printf verification to __ata_ehi_pushv_desc
  ata: fix spelling mistake: "directon" -> "direction"
  libata: Apply NOLPM quirk for SanDisk SD7UB3Q*G1001 SSDs
  libata: Apply NOLPM quirk for SAMSUNG MZMPC128HBFU-000MV SSD
  ata: ahci: mvebu: override ahci_stop_engine for mvebu AHCI
  libahci: Allow drivers to override stop_engine
  Revert "ata: ahci-platform: add reset control support"