From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Dec 2019 19:13:18 +0000 (-0800)
Subject: Merge tag 'libata-5.5-20191226' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.5-rc4~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0f710a5572ea3a0fec36ad0b613f72144d99e830;p=users%2Fhch%2Fblock.git

Merge tag 'libata-5.5-20191226' of git://git.kernel.dk/linux-block

Pull libata fixes from Jens Axboe:
 "Two things in here:

   - First half of a series that fixes ahci_brcm, also marked for
     stable. The other part of the series is going into 5.6 (Florian)

   - sata_nv regression fix that is also marked for stable (Sascha)"

* tag 'libata-5.5-20191226' of git://git.kernel.dk/linux-block:
  ata: ahci_brcm: Add missing clock management during recovery
  ata: ahci_brcm: BCM7425 AHCI requires AHCI_HFLAG_DELAY_ENGINE
  ata: ahci_brcm: Fix AHCI resources management
  ata: libahci_platform: Export again ahci_platform_<en/dis>able_phys()
  libata: Fix retrieving of active qcs
---

0f710a5572ea3a0fec36ad0b613f72144d99e830