Merge branch 'fixes' into for-next

Conflicts:
	drivers/scsi/megaraid/megaraid_sas_base.c

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

diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
index 7edc9e21c53680313cf9c859aa081265061edc87,c1ed25adb17ec1f11b039854ffa62e590032f9d6..2d62d71782fabea6c7fca5736e4e339c2cde1078
--- 1/drivers/scsi/megaraid/megaraid_sas_base.c
--- 2/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@@ -5036,8 -5036,8 +5036,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 df95d1aa1eaa3d3a2dbf13e339c5fadd0a689dd6,750f82c339d4d6c1d07a11d1bba7d14aa0a56b10..a1a5ceb42ce6d3280dadd5a521e24e4af9a2aff8
--- 1/drivers/scsi/mpt3sas/mpt3sas_base.c
--- 2/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@@ -5246,19 -5291,8 +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;