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

# Conflicts:
#	block/blk-settings.c
#	include/linux/blkdev.h

diff --cc MAINTAINERS
Simple merge

diff --cc block/blk-settings.c
index 8e1d7ed52fef367e326eaed2d2d1113a43cac4cd,292aadf8d807622a21b0ca11a3be2e449ab13877..409548cb96da1e623b4e29a224a6b217fd396cfa
--- 1/block/blk-settings.c
--- 2/block/blk-settings.c
+++ b/block/blk-settings.c
@@@ -1048,28 -822,22 +825,6 @@@ void blk_queue_write_cache(struct reque
  }
  EXPORT_SYMBOL_GPL(blk_queue_write_cache);
  
--/**
-  * blk_queue_can_use_dma_map_merging - configure queue for merging segments.
-  * @q:                the request queue for the device
-  * @dev:      the device pointer for dma
 - * blk_queue_required_elevator_features - Set a queue required elevator features
 - * @q:                the request queue for the target device
 - * @features: Required elevator features OR'ed together
-- *
-  * Tell the block layer about merging the segments by dma map of @q.
 - * Tell the block layer that for the device controlled through @q, only the
 - * only elevators that can be used are those that implement at least the set of
 - * features specified by @features.
-- */
- bool blk_queue_can_use_dma_map_merging(struct request_queue *q,
-                                      struct device *dev)
 -void blk_queue_required_elevator_features(struct request_queue *q,
 -                                        unsigned int features)
--{
-       unsigned long boundary = dma_get_merge_boundary(dev);
- 
-       if (!boundary)
-               return false;
- 
-       /* No need to update max_segment_size. see blk_queue_virt_boundary() */
-       blk_queue_virt_boundary(q, boundary);
- 
-       return true;
 -      q->required_elevator_features = features;
--}
- EXPORT_SYMBOL_GPL(blk_queue_can_use_dma_map_merging);
 -EXPORT_SYMBOL_GPL(blk_queue_required_elevator_features);
--
  /**
   * disk_set_zoned - inidicate a zoned device
   * @disk:     gendisk to configure

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

diff --cc drivers/ata/libata.h
Simple merge

diff --cc drivers/ata/pata_macio.c
Simple merge

diff --cc drivers/ata/sata_mv.c
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_main.c
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc drivers/ufs/host/ufs-qcom.c
Simple merge

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

diff --cc include/linux/blkdev.h
index d5f8f8f476c5d50b35fedda2e7880733c7672960,e3c7082efa396eae87c9271b4af4d5c9882f04fd..2c1522cb12ed27b7a9c71f68302785f9324591bc
--- 1/include/linux/blkdev.h
--- 2/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -927,9 -942,15 +929,6 @@@ disk_alloc_independent_access_ranges(st
  void disk_set_independent_access_ranges(struct gendisk *disk,
                                struct blk_independent_access_ranges *iars);
  
- extern bool blk_queue_can_use_dma_map_merging(struct request_queue *q,
-                                             struct device *dev);
 -/*
 - * Elevator features for blk_queue_required_elevator_features:
 - */
 -/* Supports zoned block devices sequential write constraint */
 -#define ELEVATOR_F_ZBD_SEQ_WRITE      (1U << 0)
 -
 -extern void blk_queue_required_elevator_features(struct request_queue *q,
 -                                               unsigned int features);
--
  bool __must_check blk_get_queue(struct request_queue *);
  extern void blk_put_queue(struct request_queue *);
  

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

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