projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 318c893 ff682a3)
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Dec 2016 20:04:41 +0000 (12:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Dec 2016 20:04:41 +0000 (12:04 -0800)
commitb4aafe77ec65ab2846a5780bb1ba4eff7ccf82d1
treebd529fa3cf6302e5fb6862dfb387b70991a87237tree | snapshot
parent318c8932ddec5c1c26a4af0f3c053784841c598ecommit | diff
parentff682a3dad98074f956e6da099448d3eb93f095ccommit | diff
Merge tag 'scsi-fixes' of git://git./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()
John Crispins staging tree