From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Apr 2017 06:36:46 +0000 (-0700)
Subject: Merge branch 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v5.15~11538
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af94bdfa798b7da92cc82609acca61a287a004a4;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull libata fixes from Tejun Heo:
 "Two libata fixes.

  One to disable hotplug on VT6420 which never worked properly. The
  other reverts an earlier patch which disabled the second port on
  SB600/700. There were some confusions due to earlier datasheets which
  incorrectly indicated that the second port is not implemented on both
  SB600 and 700"

* 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  sata_via: Enable hotplug only on VT6421
  Revert "pata_atiixp: Don't use unconnected secondary port on SB600/SB700"
---

af94bdfa798b7da92cc82609acca61a287a004a4