From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Mar 2025 02:57:34 +0000 (-0700)
Subject: Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: v6.15-rc1~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e3fcbcc3b0eb9b96d2912cdac920f0ae8d1c8f2;p=thirdparty%2Flinux.git

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 (scsi_debug, ufs, lpfc, st, fnic, mpi3mr,
  mpt3sas) and the removal of cxlflash.

  The only non-trivial core change is an addition to unit attention
  handling to recognize UAs for power on/reset and new media so the tape
  driver can use it"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (107 commits)
  scsi: st: Tighten the page format heuristics with MODE SELECT
  scsi: st: ERASE does not change tape location
  scsi: st: Fix array overflow in st_setup()
  scsi: target: tcm_loop: Fix wrong abort tag
  scsi: lpfc: Restore clearing of NLP_UNREG_INP in ndlp->nlp_flag
  scsi: hisi_sas: Fixed failure to issue vendor specific commands
  scsi: fnic: Remove unnecessary NUL-terminations
  scsi: fnic: Remove redundant flush_workqueue() calls
  scsi: core: Use a switch statement when attaching VPD pages
  scsi: ufs: renesas: Add initialization code for R-Car S4-8 ES1.2
  scsi: ufs: renesas: Add reusable functions
  scsi: ufs: renesas: Refactor 0x10ad/0x10af PHY settings
  scsi: ufs: renesas: Remove register control helper function
  scsi: ufs: renesas: Add register read to remove save/set/restore
  scsi: ufs: renesas: Replace init data by init code
  scsi: ufs: dt-bindings: renesas,ufs: Add calibration data
  scsi: mpi3mr: Task Abort EH Support
  scsi: storvsc: Don't report the host packet status as the hv status
  scsi: isci: Make most module parameters static
  scsi: megaraid_sas: Make most module parameters static
  ...
---

2e3fcbcc3b0eb9b96d2912cdac920f0ae8d1c8f2
diff --cc drivers/scsi/scsi_debug.c
index fe5c30bb26398,523f054912e14..f0eec4708ddd4
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@@ -8701,8 -9351,12 +9351,12 @@@ 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);
 -	sd_dp->hrt.function = sdebug_q_cmd_hrt_complete;
++	hrtimer_setup(&sd_dp->hrt, sdebug_q_cmd_hrt_complete, CLOCK_MONOTONIC,
++		      HRTIMER_MODE_REL_PINNED);
+ 	INIT_WORK(&sd_dp->ew.work, sdebug_q_cmd_wq_complete);
  
  	return 0;
  }