Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git

# Conflicts:
#	drivers/ata/ahci.h
#	drivers/ata/sata_mv.c
#	include/linux/libata.h

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/ata/ahci.h
index 15f736ac54563c338fdcd19124739020b5c1fdf1,75cdf51a7f745f9bbf23dfe6a361e860875030c0..8e895ae45c86b3d8597b4c122f4da1106b00451c
--- 1/drivers/ata/ahci.h
--- 2/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@@ -407,8 -396,8 +407,8 @@@ extern const struct attribute_group *ah
        .shost_groups           = ahci_shost_groups,                    \
        .sdev_groups            = ahci_sdev_groups,                     \
        .change_queue_depth     = ata_scsi_change_queue_depth,          \
 -      .tag_alloc_policy       = BLK_TAG_ALLOC_RR,                     \
 +      .tag_alloc_policy_rr    = true,                                 \
-       .device_configure       = ata_scsi_device_configure
+       .sdev_configure         = ata_scsi_sdev_configure
  
  extern struct ata_port_operations ahci_ops;
  extern struct ata_port_operations ahci_platform_ops;

diff --cc drivers/ata/pata_macio.c
index 4b01bb6880b031d84e871e3c720c7bd9ad183003,a8e2989d0469e981c42c9a62ee3e7888049c31ab..fbf5f07ea3579e896b9ebd9130e05925ac97a340
--- 1/drivers/ata/pata_macio.c
--- 2/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@@ -932,10 -932,10 +932,10 @@@ static const struct scsi_host_template 
        /* We may not need that strict one */
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .max_segment_size       = PATA_MACIO_MAX_SEGMENT_SIZE,
-       .device_configure       = pata_macio_device_configure,
+       .sdev_configure         = pata_macio_sdev_configure,
        .sdev_groups            = ata_common_sdev_groups,
        .can_queue              = ATA_DEF_QUEUE,
 -      .tag_alloc_policy       = BLK_TAG_ALLOC_RR,
 +      .tag_alloc_policy_rr    = true,
  };
  
  static struct ata_port_operations pata_macio_ops = {

diff --cc drivers/ata/sata_mv.c
index 21c72650f9ccdf6981ff40af12e7c9ee4048fa41,caf7b1303d4c4044282f4806e740c59891a4a23d..bcbf96867f89176496281f881d8f646ba1e258a2
--- 1/drivers/ata/sata_mv.c
--- 2/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@@ -672,8 -672,8 +672,8 @@@ static const struct scsi_host_template 
        .dma_boundary           = MV_DMA_BOUNDARY,
        .sdev_groups            = ata_ncq_sdev_groups,
        .change_queue_depth     = ata_scsi_change_queue_depth,
 -      .tag_alloc_policy       = BLK_TAG_ALLOC_RR,
 +      .tag_alloc_policy_rr    = true,
-       .device_configure       = ata_scsi_device_configure
+       .sdev_configure         = ata_scsi_sdev_configure
  };
  
  static struct ata_port_operations mv5_ops = {

diff --cc drivers/ata/sata_nv.c
index 823cce5ea1e9018fee93daa55360e5fad0c97b79,b62b8ebdd89f8126cf8dbb8fc315cf8fa5f45cad..f36e2915ccf1870bc42fbf3b28747ec4337a4613
--- 1/drivers/ata/sata_nv.c
--- 2/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@@ -382,10 -382,10 +382,10 @@@ static const struct scsi_host_template 
        .can_queue              = NV_ADMA_MAX_CPBS,
        .sg_tablesize           = NV_ADMA_SGTBL_TOTAL_LEN,
        .dma_boundary           = NV_ADMA_DMA_BOUNDARY,
-       .device_configure       = nv_adma_device_configure,
+       .sdev_configure         = nv_adma_sdev_configure,
        .sdev_groups            = ata_ncq_sdev_groups,
        .change_queue_depth     = ata_scsi_change_queue_depth,
 -      .tag_alloc_policy       = BLK_TAG_ALLOC_RR,
 +      .tag_alloc_policy_rr    = true,
  };
  
  static const struct scsi_host_template nv_swncq_sht = {
@@@ -393,10 -393,10 +393,10 @@@
        .can_queue              = ATA_MAX_QUEUE - 1,
        .sg_tablesize           = LIBATA_MAX_PRD,
        .dma_boundary           = ATA_DMA_BOUNDARY,
-       .device_configure       = nv_swncq_device_configure,
+       .sdev_configure         = nv_swncq_sdev_configure,
        .sdev_groups            = ata_ncq_sdev_groups,
        .change_queue_depth     = ata_scsi_change_queue_depth,
 -      .tag_alloc_policy       = BLK_TAG_ALLOC_RR,
 +      .tag_alloc_policy_rr    = true,
  };
  
  /*

diff --cc drivers/ata/sata_sil24.c
index b0e22ab76f0ead56db6864839f3064efb201925a,3e0be03996191dc3392b7a43bc694af7d8324b6b..87f4cde6a686e309d9ba550ebfacf85e7f8799c8
--- 1/drivers/ata/sata_sil24.c
--- 2/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@@ -378,9 -378,10 +378,9 @@@ static const struct scsi_host_template 
        .can_queue              = SIL24_MAX_CMDS,
        .sg_tablesize           = SIL24_MAX_SGE,
        .dma_boundary           = ATA_DMA_BOUNDARY,
 -      .tag_alloc_policy       = BLK_TAG_ALLOC_FIFO,
        .sdev_groups            = ata_ncq_sdev_groups,
        .change_queue_depth     = ata_scsi_change_queue_depth,
-       .device_configure       = ata_scsi_device_configure
+       .sdev_configure         = ata_scsi_sdev_configure
  };
  
  static struct ata_port_operations sil24_ops = {

diff --cc drivers/infiniband/ulp/srp/ib_srp.c
Simple merge

diff --cc drivers/scsi/arcmsr/arcmsr_hba.c
Simple merge

diff --cc drivers/scsi/cxlflash/main.c
Simple merge

diff --cc drivers/scsi/fnic/fnic_main.c
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas.h
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 35501d0aa65559bae9aedd7c04590085bdc2212a,6766995e227bab00923384c01f3c71ba8ca16d18..48b95d9a792753bdfdb5a2619d21627b7fc01a81
--- 1/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
--- 2/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@@ -3342,10 -3342,10 +3342,10 @@@ static const struct scsi_host_template 
        .map_queues             = hisi_sas_map_queues,
        .sg_tablesize           = HISI_SAS_SGE_PAGE_CNT,
        .sg_prot_tablesize      = HISI_SAS_SGE_PAGE_CNT,
-       .slave_alloc            = hisi_sas_slave_alloc,
+       .sdev_init              = hisi_sas_sdev_init,
        .shost_groups           = host_v3_hw_groups,
        .sdev_groups            = sdev_groups_v3_hw,
 -      .tag_alloc_policy       = BLK_TAG_ALLOC_RR,
 +      .tag_alloc_policy_rr    = true,
        .host_reset             = hisi_sas_host_reset,
        .host_tagset            = 1,
        .mq_poll                = queue_complete_v3_hw,

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

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

diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
Simple merge

diff --cc drivers/scsi/mpi3mr/mpi3mr_os.c
Simple merge

diff --cc drivers/scsi/mpt3sas/mpt3sas_scsih.c
Simple merge

diff --cc drivers/scsi/pm8001/pm8001_init.c
Simple merge

diff --cc drivers/scsi/pm8001/pm8001_sas.h
Simple merge

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

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

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

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

diff --cc drivers/scsi/smartpqi/smartpqi_init.c
Simple merge

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

diff --cc drivers/ufs/core/ufshcd.c
Simple merge

diff --cc drivers/usb/storage/scsiglue.c
Simple merge

diff --cc drivers/usb/storage/uas.c
Simple merge

diff --cc include/linux/libata.h
index be5183d75736dc974ada18691e0b73b0c2407063,7717f06a548d2345f4914bd261686b3857169721..c1c57f814b98dc6fe534badb60a1c827c180ae7a
--- 1/include/linux/libata.h
--- 2/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -1467,14 -1466,14 +1466,14 @@@ extern const struct attribute_group *at
  #define ATA_SUBBASE_SHT(drv_name)                             \
        __ATA_BASE_SHT(drv_name),                               \
        .can_queue              = ATA_DEF_QUEUE,                \
 -      .tag_alloc_policy       = BLK_TAG_ALLOC_RR,             \
 +      .tag_alloc_policy_rr    = true,                         \
-       .device_configure       = ata_scsi_device_configure
+       .sdev_configure         = ata_scsi_sdev_configure
  
  #define ATA_SUBBASE_SHT_QD(drv_name, drv_qd)                  \
        __ATA_BASE_SHT(drv_name),                               \
        .can_queue              = drv_qd,                       \
 -      .tag_alloc_policy       = BLK_TAG_ALLOC_RR,             \
 +      .tag_alloc_policy_rr    = true,                         \
-       .device_configure       = ata_scsi_device_configure
+       .sdev_configure         = ata_scsi_sdev_configure
  
  #define ATA_BASE_SHT(drv_name)                                        \
        ATA_SUBBASE_SHT(drv_name),                              \

diff --cc include/scsi/scsi_host.h
Simple merge

diff --cc include/scsi/scsi_transport_iscsi.h
Simple merge