Merge remote-tracking branch 'scsi/for-next'

Conflicts:
	drivers/scsi/ipr.c
	drivers/scsi/qla2xxx/qla_nx.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/ata/libata-eh.c
Simple merge

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

diff --cc drivers/scsi/ipr.c
index a7ad778766e6104c072ca014c60f12804b677820,ec8abb08cb7124e2a84f55fdc6215ff332916a21..5884d3d94ca0a854ad68316927b5ab632944741f
--- 1/drivers/scsi/ipr.c
--- 2/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@@ -6330,8 -6399,8 +6399,8 @@@ static int ipr_invalid_adapter(struct i
        int i;
  
        if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) {
-               for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){
+               for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++) {
 -                      if (__is_processor(ipr_blocked_processors[i]))
 +                      if (pvr_version_is(ipr_blocked_processors[i]))
                                return 1;
                }
        }

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_base.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_scsih.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_nx.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_nx.c
index 807bf76f1b6a851c137af35865cb4d8082ca452d,66f52d2b5cd49497b5b81219235417dd1f8361db..499a92db1cf64d3b1d44201592b289aefd38cd71
--- 1/drivers/scsi/qla4xxx/ql4_nx.c
--- 2/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@@ -1564,8 -1638,9 +1638,8 @@@ qla4_8xxx_set_qsnt_ready(struct scsi_ql
  
  
  static int
- qla4_8xxx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start)
+ qla4_82xx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start)
  {
 -      int pcie_cap;
        uint16_t lnk;
  
        /* scrub dma mask expansion register */

diff --cc drivers/scsi/qla4xxx/ql4_os.c
Simple merge

diff --cc include/linux/libata.h
Simple merge