From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Nov 2019 18:57:53 +0000 (-0800)
Subject: Merge tag 'for-5.5/libata-20191121' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.10.7~3867
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e7b06a4c88846c20c2cc01b370564a2423ff0d0;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull libata updates from Jens Axboe:
 "Just a few fixes all over the place, support for the Annapurna SATA
  controller, and a patchset that cleans up the error defines and
  ultimately fixes anissue with sata_mv"

* tag 'for-5.5/libata-20191121' of git://git.kernel.dk/linux-block:
  ata: pata_artop: make arrays static const, makes object smaller
  ata_piix: remove open-coded dmi_match(DMI_OEM_STRING)
  ata: sata_mv, avoid trigerrable BUG_ON
  ata: make qc_prep return ata_completion_errors
  ata: define AC_ERR_OK
  ata: Documentation, fix function names
  libata: Ensure ata_port probe has completed before detach
  ahci: tegra: use regulator_bulk_set_supply_names()
  ahci: Add support for Amazon's Annapurna Labs SATA controller
---

6e7b06a4c88846c20c2cc01b370564a2423ff0d0