NVMe: Make I/O timeout a module parameter
authorKeith Busch <keith.busch@intel.com>
Fri, 4 Apr 2014 17:43:36 +0000 (11:43 -0600)
committerMatthew Wilcox <matthew.r.wilcox@intel.com>
Thu, 10 Apr 2014 21:04:38 +0000 (17:04 -0400)
Increase the default timeout to 30 seconds to match SCSI.

Signed-off-by: Keith Busch <keith.busch@intel.com>
[use byte instead of ushort]
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
drivers/block/nvme-core.c
include/linux/nvme.h

Simple merge
Simple merge