projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c35e30b 7569b90)
Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-4.12/post-merge
authorJens Axboe <axboe@fb.com>
Thu, 27 Apr 2017 17:33:01 +0000 (11:33 -0600)
committerJens Axboe <axboe@fb.com>
Thu, 27 Apr 2017 17:33:01 +0000 (11:33 -0600)
commitb06e13c38dbd5a03e945ce711f6909c91888f507
tree5d4514f49463e014d6b40c646796a88ba13d9c09tree | snapshot
parentc35e30b4727b390ce7a6dd7ead31335320c2b83ecommit | diff
parent7569b90a228ed7dfdc1f92f2c98d7a1b041f22ebcommit | diff
Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-4.12/post-merge

Christoph writes:

"A couple more updates for 4.12.  The biggest pile is fc and lpfc
 updates from James, but there are various small fixes and cleanups as
 well."

Fixes up a few merge issues, and also a warning in
lpfc_nvmet_rcv_unsol_abort() if CONFIG_NVME_TARGET_FC isn't enabled.

Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/scsi/lpfc/lpfc_els.c diff1 | diff2 | blob | history
drivers/scsi/lpfc/lpfc_nvmet.c diff1 | diff2 | blob | history
John Crispins staging tree