From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Feb 2021 22:42:52 +0000 (-0800)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: nvme-5.12-2021-03-04~253
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=964d069f93c4468b220f7e15fac7a3f7bd6d13ec;p=nvme.git

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

Pull SCSI fix from James Bottomley:
 "One fix in drivers (lpfc) that stops an oops on resource exhaustion"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: lpfc: Fix EEH encountering oops with NVMe traffic
---

964d069f93c4468b220f7e15fac7a3f7bd6d13ec