From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Feb 2025 04:25:01 +0000 (+1100)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
X-Git-Tag: next-20250225~34
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=b2cda0307749302a4f2077f32166896a466127b5;p=linux%2F.git

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

# Conflicts:
#	drivers/scsi/scsi_debug.c
---

b2cda0307749302a4f2077f32166896a466127b5
diff --cc drivers/scsi/scsi_debug.c
index fe5c30bb2639,2208dcba346e..722ee8c067ae
--- a/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;
  }