Jens Axboe b06e13c38d 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>		2017-04-27 11:33:01 -06:00
..
host	Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-4.12/post-merge	2017-04-27 11:33:01 -06:00
target	Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-4.12/post-merge	2017-04-27 11:33:01 -06:00
Kconfig	nvmet: add a generic NVMe target	2016-07-05 11:30:33 -06:00
Makefile	nvmet: add a generic NVMe target	2016-07-05 11:30:33 -06:00