Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "Updates to the usual drivers (ufs, lpfc, qla2xxx, mpi3mr, libsas).

  The major update (which causes a conflict with block, see below) is
  Christoph removing the queue limits and their associated block
  helpers.

  The remaining patches are assorted minor fixes and deprecated function
  updates plus a bit of constification"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (141 commits)
  scsi: mpi3mr: Sanitise num_phys
  scsi: lpfc: Copyright updates for 14.4.0.2 patches
  scsi: lpfc: Update lpfc version to 14.4.0.2
  scsi: lpfc: Add support for 32 byte CDBs
  scsi: lpfc: Change lpfc_hba hba_flag member into a bitmask
  scsi: lpfc: Introduce rrq_list_lock to protect active_rrq_list
  scsi: lpfc: Clear deferred RSCN processing flag when driver is unloading
  scsi: lpfc: Update logging of protection type for T10 DIF I/O
  scsi: lpfc: Change default logging level for unsolicited CT MIB commands
  scsi: target: Remove unused list 'device_list'
  scsi: iscsi: Remove unused list 'connlist_err'
  scsi: ufs: exynos: Add support for Tensor gs101 SoC
  scsi: ufs: exynos: Add some pa_dbg_ register offsets into drvdata
  scsi: ufs: exynos: Allow max frequencies up to 267Mhz
  scsi: ufs: exynos: Add EXYNOS_UFS_OPT_TIMER_TICK_SELECT option
  scsi: ufs: exynos: Add EXYNOS_UFS_OPT_UFSPR_SECURE option
  scsi: ufs: dt-bindings: exynos: Add gs101 compatible
  scsi: qla2xxx: Fix debugfs output for fw_resource_count
  scsi: qedf: Ensure the copied buf is NUL terminated
  scsi: bfa: Ensure the copied buf is NUL terminated
  ...

diff --cc Documentation/driver-api/scsi.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc block/blk-settings.c
index ebba05a2bc7f590c80e1ee37cc0c409d26ba2f6d,292aadf8d807622a21b0ca11a3be2e449ab13877..a7fe8e90240a6eea7a841e58de4ae355265feeb2
--- 1/block/blk-settings.c
--- 2/block/blk-settings.c
+++ b/block/blk-settings.c
@@@ -1051,28 -822,22 +828,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/message/fusion/mptsas.c
Simple merge

diff --cc drivers/scsi/bnx2fc/bnx2fc_tgt.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/libsas/sas_expander.c
Simple merge

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

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

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

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

diff --cc drivers/scsi/sd.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 69c4f113db428dfb44bea0d69d140e7969806792,e3c7082efa396eae87c9271b4af4d5c9882f04fd..fd5951dd6b7d8013aacefec6e17c6889951154a3
--- 1/include/linux/blkdev.h
--- 2/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -945,9 -942,15 +947,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_driver.h
Simple merge

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

diff --cc include/uapi/scsi/scsi_bsg_mpi3mr.h
Simple merge