This is the set of changes collected since just before the merge window opened. It's mostly minor fixes in drivers. The one non-driver set is the three optical disk (sr) changes where two are error path fixes and one is a helper conversion. The big driver change is the hpsa compat_alloc_userspace rework by Al so he can kill the remaining user. This has been tested and acked by the maintainer. There's a minor merge conflict in sr.c because of a711d91cd97e ("block: add a cdrom_device_info pointer to struct gendisk") but the resolution is pretty obvious. The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-misc The short changelog is: Al Viro (4): scsi: hpsa: hpsa_ioctl(): Tidy up a bit scsi: hpsa: Get rid of compat_alloc_user_space() scsi: hpsa: Don't bother with vmalloc for BIG_IOCTL_Command_struct scsi: hpsa: Lift {BIG_,}IOCTL_Command_struct copy{in,out} into hpsa_ioctl() Bodo Stroesser (1): scsi: target: tcmu: Fix size in calls to tcmu_flush_dcache_range Can Guo (1): scsi: ufs: Don't update urgent bkops level when toggling auto bkops Christophe JAILLET (1): scsi: acornscsi: Fix an error handling path in acornscsi_probe() Colin Ian King (1): scsi: qedf: Remove redundant initialization of variable rc Dan Carpenter (1): scsi: cxlflash: Remove an unnecessary NULL check Denis Efremov (1): scsi: storvsc: Remove memset before memory freeing in storvsc_suspend() John Hubbard (1): scsi: st: Convert convert get_user_pages() --> pin_user_pages() Qiushi Wu (1): scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj Simon Arlott (2): scsi: sr: Fix sr_probe() missing deallocate of device minor scsi: sr: Fix sr_probe() missing mutex_destroy Stanley Chu (1): scsi: ufs: Remove redundant urgent_bkop_lvl initialization Sudhakar Panneerselvam (4): scsi: target: Rename target_setup_cmd_from_cdb() to target_cmd_parse_cdb() scsi: target: Fix NULL pointer dereference scsi: target: Initialize LUN in transport_init_se_cmd() scsi: target: Factor out a new helper, target_cmd_init_cdb() Suganath Prabu S (1): scsi: mpt3sas: Fix memset() in non-RDPQ mode Tyrel Datwyler (1): scsi: ibmvscsi: Don't send host info in adapter info MAD after LPM And the diffstat: drivers/scsi/arm/acornscsi.c | 4 +- drivers/scsi/cxlflash/main.c | 3 - drivers/scsi/hpsa.c | 199 +++++++++++++++------------------ drivers/scsi/ibmvscsi/ibmvscsi.c | 2 + drivers/scsi/iscsi_boot_sysfs.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 5 +- drivers/scsi/qedf/qedf_fip.c | 2 +- drivers/scsi/sr.c | 7 +- drivers/scsi/st.c | 20 +--- drivers/scsi/storvsc_drv.c | 3 - drivers/scsi/ufs/ufshcd.c | 6 +- drivers/target/iscsi/iscsi_target.c | 29 ++--- drivers/target/target_core_device.c | 19 ++-- drivers/target/target_core_tmr.c | 4 +- drivers/target/target_core_transport.c | 55 ++++++--- drivers/target/target_core_user.c | 4 +- drivers/target/target_core_xcopy.c | 9 +- drivers/usb/gadget/function/f_tcm.c | 6 +- include/target/target_core_fabric.h | 9 +- 19 files changed, 195 insertions(+), 193 deletions(-) James