Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Feb 2021 22:42:52 +0000 (14:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Feb 2021 22:42:52 +0000 (14:42 -0800)
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


Trivial merge