From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 May 2018 16:36:16 +0000 (-0700)
Subject: Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v5.15~8812
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=577e75e0c9da98b898d2dbe94c30b40eec5b9c99;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-4.17-fixes' of git://git./linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
 "Nothing too interesting.  Four patches to update the blacklist and
  add a controller ID"

* 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: Add PCI ID for Cannon Lake PCH-LP AHCI
  libata: blacklist Micron 500IT SSD with MU01 firmware
  libata: Apply NOLPM quirk for SAMSUNG PM830 CXM13D1Q.
  libata: Blacklist some Sandisk SSDs for NCQ
---

577e75e0c9da98b898d2dbe94c30b40eec5b9c99