diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-08 21:04:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-08 21:04:41 +0100 |
| commit | b4aafe77ec65ab2846a5780bb1ba4eff7ccf82d1 (patch) | |
| tree | bd529fa3cf6302e5fb6862dfb387b70991a87237 /drivers/nfc/Makefile | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes (diff) | |
| download | linux-b4aafe77ec65ab2846a5780bb1ba4eff7ccf82d1.tar.xz linux-b4aafe77ec65ab2846a5780bb1ba4eff7ccf82d1.zip | |
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()
Diffstat (limited to 'drivers/nfc/Makefile')
0 files changed, 0 insertions, 0 deletions