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

# Conflicts:
#	drivers/scsi/scsi_debug.c

diff --cc arch/arm64/boot/dts/rockchip/rk3576.dtsi
Simple merge

diff --cc drivers/scsi/scsi_debug.c
index fe5c30bb263986727b4d943d43a28ee208cb6aae,2208dcba346edc41a6be58ea41cec30e81d295cb..722ee8c067aeb0e291596edf845608ed7f9b4c14
--- 1/drivers/scsi/scsi_debug.c
--- 2/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@@ -8701,8 -9351,12 +9351,13 @@@ err_out
  static int sdebug_init_cmd_priv(struct Scsi_Host *shost, struct scsi_cmnd *cmd)
  {
        struct sdebug_scsi_cmd *sdsc = scsi_cmd_priv(cmd);
+       struct sdebug_defer *sd_dp = &sdsc->sd_dp;
  
        spin_lock_init(&sdsc->lock);
 -      hrtimer_init(&sd_dp->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
++      hrtimer_setup(&sd_dp->hrt, sdebug_q_cmd_hrt_complete, CLOCK_MONOTONIC,
++                    HRTIMER_MODE_REL_PINNED);
+       sd_dp->hrt.function = sdebug_q_cmd_hrt_complete;
+       INIT_WORK(&sd_dp->ew.work, sdebug_q_cmd_wq_complete);
  
        return 0;
  }

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

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