From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Dec 2016 18:49:33 +0000 (-0800)
Subject: Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a829a8445f09036404060f4d6489cb13433f4304;p=linux-beck.git

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

Pull SCSI updates from James Bottomley:
 "This update includes the usual round of major driver updates (ncr5380,
  lpfc, hisi_sas, megaraid_sas, ufs, ibmvscsis, mpt3sas).

  There's also an assortment of minor fixes, mostly in error legs or
  other not very user visible stuff. The major change is the
  pci_alloc_irq_vectors replacement for the old pci_msix_.. calls; this
  effectively makes IRQ mapping generic for the drivers and allows
  blk_mq to use the information"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (256 commits)
  scsi: qla4xxx: switch to pci_alloc_irq_vectors
  scsi: hisi_sas: support deferred probe for v2 hw
  scsi: megaraid_sas: switch to pci_alloc_irq_vectors
  scsi: scsi_devinfo: remove synchronous ALUA for NETAPP devices
  scsi: be2iscsi: set errno on error path
  scsi: be2iscsi: set errno on error path
  scsi: hpsa: fallback to use legacy REPORT PHYS command
  scsi: scsi_dh_alua: Fix RCU annotations
  scsi: hpsa: use %phN for short hex dumps
  scsi: hisi_sas: fix free'ing in probe and remove
  scsi: isci: switch to pci_alloc_irq_vectors
  scsi: ipr: Fix runaway IRQs when falling back from MSI to LSI
  scsi: dpt_i2o: double free on error path
  scsi: cxlflash: Migrate scsi command pointer to AFU command
  scsi: cxlflash: Migrate IOARRIN specific routines to function pointers
  scsi: cxlflash: Cleanup queuecommand()
  scsi: cxlflash: Cleanup send_tmf()
  scsi: cxlflash: Remove AFU command lock
  scsi: cxlflash: Wait for active AFU commands to timeout upon tear down
  scsi: cxlflash: Remove private command pool
  ...
---

a829a8445f09036404060f4d6489cb13433f4304
diff --cc drivers/scsi/ufs/ufshcd.c
index cf549871c1ee,0c75c75217f8..ef8548c3a423
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -5589,8 -5820,8 +5820,8 @@@ ufshcd_send_request_sense(struct ufs_hb
  	}
  
  	ret = scsi_execute_req_flags(sdp, cmd, DMA_FROM_DEVICE, buffer,
- 				SCSI_SENSE_BUFFERSIZE, NULL,
+ 				UFSHCD_REQ_SENSE_SIZE, NULL,
 -				msecs_to_jiffies(1000), 3, NULL, REQ_PM);
 +				msecs_to_jiffies(1000), 3, NULL, 0, RQF_PM);
  	if (ret)
  		pr_err("%s: failed with err %d\n", __func__, ret);