tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes

James Bottomley 6344a5cd 13b43891

+3 -1
+2
drivers/scsi/hisi_sas/Kconfig
··· 1 1 config SCSI_HISI_SAS 2 2 tristate "HiSilicon SAS" 3 + depends on HAS_DMA 4 + depends on ARM64 || COMPILE_TEST 3 5 select SCSI_SAS_LIBSAS 4 6 select BLK_DEV_INTEGRITY 5 7 help
+1 -1
drivers/scsi/sd.c
··· 2893 2893 sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS && 2894 2894 sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE) 2895 2895 rw_max = q->limits.io_opt = 2896 - logical_to_sectors(sdp, sdkp->opt_xfer_blocks); 2896 + sdkp->opt_xfer_blocks * sdp->sector_size; 2897 2897 else 2898 2898 rw_max = BLK_DEF_MAX_SECTORS; 2899 2899