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

diff --cc block/blk-mq-sched.c
Simple merge

diff --cc drivers/infiniband/ulp/srpt/ib_srpt.c
Simple merge

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

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

diff --cc drivers/scsi/ibmvscsi/ibmvfc.c
Simple merge

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

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

diff --cc drivers/scsi/scsi_lib.c
index c289991ffaed2f9ab4c20067191647db63aa3a27,4bcd744a5c85560d545c96af0c827bd99b332104..7d97e00b53f92be1004402a62b2b61f444fc9ad1
--- 1/drivers/scsi/scsi_lib.c
--- 2/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@@ -1747,9 -1806,30 +1768,29 @@@ static void scsi_mq_exit_request(struc
  
        if (shost->hostt->exit_cmd_priv)
                shost->hostt->exit_cmd_priv(shost, cmd);
 -      scsi_free_sense_buffer(cmd->flags & SCMD_UNCHECKED_ISA_DMA,
 -                             cmd->sense_buffer);
 +      kmem_cache_free(scsi_sense_cache, cmd->sense_buffer);
  }
  
+ 
+ static int scsi_mq_poll(struct blk_mq_hw_ctx *hctx)
+ {
+       struct Scsi_Host *shost = hctx->driver_data;
+ 
+       if (shost->hostt->mq_poll)
+               return shost->hostt->mq_poll(shost, hctx->queue_num);
+ 
+       return 0;
+ }
+ 
+ static int scsi_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
+                         unsigned int hctx_idx)
+ {
+       struct Scsi_Host *shost = data;
+ 
+       hctx->driver_data = shost;
+       return 0;
+ }
+ 
  static int scsi_map_queues(struct blk_mq_tag_set *set)
  {
        struct Scsi_Host *shost = container_of(set, struct Scsi_Host, tag_set);

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

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

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

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

diff --cc drivers/target/target_core_pscsi.c
Simple merge

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

diff --cc include/scsi/scsi_host.h
index 8343c6f9fec19ed543b72fed0dfd2188b5394895,3f3ebfdedeb2ae28ce29b013bc74ff456797e660..d0bf88d77f02610df18d83a58c3a6dd58a4066fe
--- 1/include/scsi/scsi_host.h
--- 2/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@@ -611,7 -631,9 +626,8 @@@ struct Scsi_Host 
         * the total queue depth is can_queue.
         */
        unsigned nr_hw_queues;
+       unsigned nr_maps;
        unsigned active_mode:2;
 -      unsigned unchecked_isa_dma:1;
  
        /*
         * Host has requested that no further requests come through for the