From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Jan 2018 19:26:59 +0000 (-0800)
Subject: Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v4.15-rc9~13
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9f77a11ab2e5377173d28df93edbc73a02fa06b6;p=users%2Fhch%2Fmisc.git

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

Pull libata fixlet from Tejun Heo:
 "This just adds one more entry for liteon optical drives to the device
  blacklist for large IOs.

  The change is very low risk"

* 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata: apply MAX_SEC_1024 to all LITEON EP1 series devices
---

9f77a11ab2e5377173d28df93edbc73a02fa06b6