From: Linus Torvalds 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.9.8~3724 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d683477020be2036d6c2d7d2cd3ffac4f2acbd6c;p=platform%2Fkernel%2Flinux-rpi3.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