Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull more SCSI updates from James Bottomley:
 "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"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (21 commits)
  scsi: acornscsi: Fix an error handling path in acornscsi_probe()
  scsi: storvsc: Remove memset before memory freeing in storvsc_suspend()
  scsi: cxlflash: Remove an unnecessary NULL check
  scsi: ibmvscsi: Don't send host info in adapter info MAD after LPM
  scsi: sr: Fix sr_probe() missing deallocate of device minor
  scsi: sr: Fix sr_probe() missing mutex_destroy
  scsi: st: Convert convert get_user_pages() --> pin_user_pages()
  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()
  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()
  scsi: ufs: Remove redundant urgent_bkop_lvl initialization
  scsi: ufs: Don't update urgent bkops level when toggling auto bkops
  scsi: qedf: Remove redundant initialization of variable rc
  scsi: mpt3sas: Fix memset() in non-RDPQ mode
  scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj
  ...

diff --cc drivers/scsi/ibmvscsi/ibmvscsi.c
Simple merge

diff --cc drivers/scsi/sr.c
index 4dcd735ea49e069cbca338a1bcdfc7efc64242e1,b9cff27e2c810bed2958731fd349de1d0fefe581..0c4aa4665a2f9d2a6fa9db565a220f01322c5ec1
--- 1/drivers/scsi/sr.c
--- 2/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@@ -790,9 -790,10 +790,9 @@@ static int sr_probe(struct device *dev
        set_capacity(disk, cd->capacity);
        disk->private_data = &cd->driver;
        disk->queue = sdev->request_queue;
 -      cd->cdi.disk = disk;
  
 -      if (register_cdrom(&cd->cdi))
 +      if (register_cdrom(disk, &cd->cdi))
-               goto fail_put;
+               goto fail_minor;
  
        /*
         * Initialize block layer runtime PM stuffs before the

diff --cc drivers/scsi/storvsc_drv.c
Simple merge

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/target/target_core_user.c
Simple merge

diff --cc drivers/usb/gadget/function/f_tcm.c
Simple merge