From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Aug 2015 23:20:45 +0000 (-0700)
Subject: Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~11801
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4e7fca0d0afdfa6be0f429f9a2649b3cf92197e7;p=mirror_ubuntu-focal-kernel.git

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
---

4e7fca0d0afdfa6be0f429f9a2649b3cf92197e7