From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Dec 2016 20:04:41 +0000 (-0800)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: v4.9~12
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/b4aafe77ec65ab2846a5780bb1ba4eff7ccf82d1

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

Pull SCSI fix from James Bottomley:
 "One small fix for a regression in a prior fix (again).

  This time the condition in the prior fix BUG_ON proved to be wrong
  under certain circumstances causing a BUG to trigger where it
  shouldn't in the lpfc driver"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: lpfc: fix oops/BUG in lpfc_sli_ringtxcmpl_put()
---

b4aafe77ec65ab2846a5780bb1ba4eff7ccf82d1