From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 May 2016 20:17:12 +0000 (-0700)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: v4.6~19
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=685764b108a7e5fe9f5ee213d6a627c1166d7c88;p=karo-tx-linux.git

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "This is a couple of small fixes: one is a potential uninitialised
  error variable in the alua code, potentially causing spurious failures
  and the other is a problem caused by the conversion of SCSI to
  hostwide tags which resulted in the qla1280 driver always failing in
  host initialisation"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  qla1280: Don't allocate 512kb of host tags
  scsi_dh_alua: uninitialized variable in alua_rtpg()
---

685764b108a7e5fe9f5ee213d6a627c1166d7c88