tree 8b3a917988572ded2e3d60e09c19e86326d7caae
parent af9468db44989f995ec98c5cc63c99b16b78ee66
parent e185934ff94466b4a449165e5f1c164a44d005f2
author Linus Torvalds <torvalds@linux-foundation.org> 1481310465 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1481310465 -0800

Merge branch 'for-4.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
 "This is quite late but SCT Write Same support added during this cycle
  is broken subtly but seriously and it'd be best to disable it before
  v4.9 gets released.

  This contains two commits - one low impact sata_mv fix and the
  mentioned disabling of SCT Write Same"

* 'for-4.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata-scsi: disable SCT Write Same for the moment
  ata: sata_mv: check for errors when parsing nr-ports from dt