tree 91ef397b12a6a8ea9e89aa2b162709ddea2a6127
parent e9ab22d292aa168ed8d4cb45353a626a3d6f1522
parent f9114d357858c1429dcde022706db7443918f49f
author Linus Torvalds <torvalds@linux-foundation.org> 1439853645 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1439853645 -0700

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

Pull libata fixes from Tejun Heo:
 "Three minor device-specific fixes and revert of NCQ autosense added
  during this -rc1.

  It turned out that NCQ autosense as currently implemented interferes
  with the usual error handling behavior.  It will be revisited in the
  near future"

* 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ata: ahci_brcmstb: Fix misuse of IS_ENABLED
  sata_sx4: Check return code from pdc20621_i2c_read()
  Revert "libata: Implement NCQ autosense"
  Revert "libata: Implement support for sense data reporting"
  Revert "libata-eh: Set 'information' field for autosense"
  ata: ahci_brcmstb: Fix warnings with CONFIG_PM_SLEEP=n