From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Aug 2015 03:46:22 +0000 (-0700)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: v4.2-rc8~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;ds=sidebyside;h=d683477020be2036d6c2d7d2cd3ffac4f2acbd6c;p=linux-2.6-block.git

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

Pull SCSI fixes from James Bottomley:
 "A couple of major (hang and deadlock) fixes with fortunately fairly
  rare triggering conditions.  The PM oops is only really triggered by
  people using enclosure services (rare) and the fnic driver is mostly
  used in enterprise environments"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  SCSI: Fix NULL pointer dereference in runtime PM
  fnic: Use the local variable instead of I/O flag to acquire io_req_lock in fnic_queuecommand() to avoid deadloack
---

d683477020be2036d6c2d7d2cd3ffac4f2acbd6c