Jens Axboe 8f66439eec Linux 4.12-rc5 ... -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJZPdbLAAoJEHm+PkMAQRiGx4wH/1nCjfnl6fE8oJ24/1gEAOUh biFdqJkYZmlLYHVtYfLm4Ueg4adJdg0wx6qM/4RaAzmQVvLfDV34bc1qBf1+P95G kVF+osWyXrZo5cTwkwapHW/KNu4VJwAx2D1wrlxKDVG5AOrULH1pYOYGOpApEkZU 4N+q5+M0ce0GJpqtUZX+UnI33ygjdDbBxXoFKsr24B7eA0ouGbAJ7dC88WcaETL+ 2/7tT01SvDMo0jBSV0WIqlgXwZ5gp3yPGnklC3F4159Yze6VFrzHMKS/UpPF8o8E W9EbuzwxsKyXUifX2GY348L1f+47glen/1sedbuKnFhP6E9aqUQQJXvEO7ueQl4= =m2Gx -----END PGP SIGNATURE----- Merge tag 'v4.12-rc5' into for-4.13/block We've already got a few conflicts and upcoming work depends on some of the changes that have gone into mainline as regression fixes for this series. Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream trees to continue working on 4.13 changes. Signed-off-by: Jens Axboe <axboe@kernel.dk>		2017-06-12 08:30:13 -06:00
..
core.c	Linux 4.12-rc5	2017-06-12 08:30:13 -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	Linux 4.12-rc5	2017-06-12 08:30:13 -06:00
Kconfig	nvme-fabrics: Add host support for FC transport	2016-12-06 10:17:56 +02:00
lightnvm.c	block: introduce new block status code type	2017-06-09 09:27:32 -06:00
Makefile	nvme-fabrics: Add host support for FC transport	2016-12-06 10:17:56 +02:00
nvme.h	blk-mq: switch ->queue_rq return value to blk_status_t	2017-06-09 09:27:32 -06:00
pci.c	Linux 4.12-rc5	2017-06-12 08:30:13 -06:00
rdma.c	Linux 4.12-rc5	2017-06-12 08:30:13 -06:00
scsi.c	nvme-scsi: remove nvme_trans_security_protocol	2017-04-27 08:39:32 +02:00