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
..
core.c	nvme: Add nvme_core.force_apst to ignore the NO_APST quirk	2017-04-24 22:03:46 -06:00
fabrics.c	nvme-fabrics: Allow ctrl loss timeout configuration	2017-04-04 09:48:23 -06:00
fabrics.h	nvme-fabrics: Allow ctrl loss timeout configuration	2017-04-04 09:48:23 -06:00
fc.c	nvme-fc: avoid memory corruption caused by calling nvmf_free_options() twice	2017-04-25 20:00:59 +02:00
Kconfig	nvme-fabrics: Add host support for FC transport	2016-12-06 10:17:56 +02:00
lightnvm.c	nvme-lightnvm: add missing endianess conversion in nvme_nvm_end_io	2017-04-25 20:01:15 +02:00
Makefile	nvme-fabrics: Add host support for FC transport	2016-12-06 10:17:56 +02:00
nvme.h	Merge branch 'master' into for-4.12/post-merge	2017-04-24 22:03:14 -06:00
pci.c	Merge branch 'master' into for-4.12/post-merge	2017-04-24 22:03:14 -06:00
rdma.c	Merge branch 'master' into for-4.12/post-merge	2017-04-24 22:03:14 -06:00
scsi.c	nvme-scsi: remove nvme_trans_security_protocol	2017-04-27 08:39:32 +02:00