From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Feb 2016 00:24:48 +0000 (-0800)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dd8fc10e606127e2dffdb6704e7ec203c86a214d;p=openwrt%2Fstaging%2Fblogic.git

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

Pull SCSI fixes from James Bottomley:
 "Two simple fixes.

  One prevents a soft lockup on some target removal scenarios and the
  other prevents us trying to probe the marvell console device, which
  causes it to time out and need the bus resetting"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: fix soft lockup in scsi_remove_target() on module removal
  SCSI: Add Marvell configuration device to VPD blacklist
---

dd8fc10e606127e2dffdb6704e7ec203c86a214d