From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Oct 2016 16:28:53 +0000 (-0700)
Subject: Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: v4.9-rc1~95
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=4dfddf503670d8def0fddb497e628130fc4522a8

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

Pull SCSI updates from James Bottomley:
 "This update includes the usual round of major driver updates (hpsa,
  be2iscsi, hisi_sas, zfcp, cxlflash). There's a new incarnation of hpsa
  called smartpqi for which a driver is added, there's some cleanup work
  of the ibm vscsi target and updates to libfc, plus a whole host of
  minor fixes and updates and finally the removal of several ISA drivers
  which seem not to have been used for years"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (173 commits)
  scsi: mvsas: Mark symbols static where possible
  scsi: pm8001: Mark symbols static where possible
  scsi: arcmsr: Simplify user_len checking
  scsi: fcoe: fix off by one in eth2fc_speed()
  scsi: dtc: remove from tree
  scsi: t128: remove from tree
  scsi: pas16: remove from tree
  scsi: u14-34f: remove from tree
  scsi: ultrastor: remove from tree
  scsi: in2000: remove from tree
  scsi: wd7000: remove from tree
  scsi: scsi_dh_alua: Fix memory leak in alua_rtpg()
  scsi: lpfc: Mark symbols static where possible
  scsi: hpsa: correct call to hpsa_do_reset
  scsi: ufs: Get a TM service response from the correct offset
  scsi: ibmvfc: Fix I/O hang when port is not mapped
  scsi: megaraid_sas: clean function declarations in megaraid_sas_base.c up
  scsi: ipr: Remove redundant messages at adapter init time
  scsi: ipr: Don't log unnecessary 9084 error details
  scsi: smartpqi: raid bypass lba calculation fix
  ...
---

4dfddf503670d8def0fddb497e628130fc4522a8
diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
index c1ed25adb17e,c3efcc725540..9ff57dee72d7
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@@ -5036,8 -5023,8 +5023,8 @@@ static int megasas_init_fw(struct megas
  
  	/* Find first memory bar */
  	bar_list = pci_select_bars(instance->pdev, IORESOURCE_MEM);
- 	instance->bar = find_first_bit(&bar_list, sizeof(unsigned long));
+ 	instance->bar = find_first_bit(&bar_list, BITS_PER_LONG);
 -	if (pci_request_selected_regions(instance->pdev, instance->bar,
 +	if (pci_request_selected_regions(instance->pdev, 1<<instance->bar,
  					 "megasas: LSI")) {
  		dev_printk(KERN_DEBUG, &instance->pdev->dev, "IO memory region busy!\n");
  		return -EBUSY;
diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c
index 750f82c339d4,df95d1aa1eaa..a1a5ceb42ce6
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@@ -5291,8 -5246,19 +5257,8 @@@ mpt3sas_base_attach(struct MPT3SAS_ADAP
  	if (r)
  		goto out_free_resources;
  
 -	if (ioc->is_warpdrive) {
 -		ioc->reply_post_host_index[0] = (resource_size_t __iomem *)
 -		    &ioc->chip->ReplyPostHostIndex;
 -
 -		for (i = 1; i < ioc->cpu_msix_table_sz; i++)
 -			ioc->reply_post_host_index[i] =
 -			(resource_size_t __iomem *)
 -			((u8 __iomem *)&ioc->chip->Doorbell + (0x4000 + ((i - 1)
 -			* 4)));
 -	}
 -
  	pci_set_drvdata(ioc->pdev, ioc->shost);
- 	r = _base_get_ioc_facts(ioc, CAN_SLEEP);
+ 	r = _base_get_ioc_facts(ioc);
  	if (r)
  		goto out_free_resources;