From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Jun 2018 23:59:33 +0000 (-0700)
Subject: Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
X-Git-Tag: v4.18-rc1~132
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=476d9ff653b3b2d7f3140c56da771f2b4a3d1c0a;p=linux.git

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

Pull libata fixes from Tejun Heo:
 "These two are fixes which missed v4.17.

  One is to remove an incorrect power management blacklist entry and the
  other to fix a cdb buffer overrun which has been there for a very long
  time"

* 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk
  libata: zpodd: small read overflow in eject_tray()
---

476d9ff653b3b2d7f3140c56da771f2b4a3d1c0a