Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2015-06-10 21:03:20 -07:00
2 changed files with 3 additions and 2 deletions
+2 -1
View File
@@ -299,7 +299,8 @@ static inline void hex2bin(u8 *dst, const char *src, size_t count)
}
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) && \
!defined(CONFIG_COMPAT_KERNEL_3_12)
/*
* See also patch "new helper: file_inode(file)" (commit ID
* 496ad9aa8ef448058e36ca7a787c61f2e63f0f54). See also patch
+1 -1
View File
@@ -366,7 +366,7 @@ Performance Notes - Target Side
Performance Notes - Initiator Side
----------------------------------
* Using multiple RDMA connections between initator and target results in a
* Using multiple RDMA connections between initiator and target results in a
significant performance improvement. To benefit from this feature, use
kernel 3.19 or later at the initiator side and enable scsi-mq either by
setting SCSI_MQ_DEFAULT=y in the kernel config or via the following command: