Subject: Re: linux-next: manual merge of the scsi-mkp tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 4 Mar 2025 18:11:32 +1100

Hi all,

On Tue, 25 Feb 2025 15:32:00 +1100 Stephen Rothwell <[email-masked]> wrote:
> 
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>   drivers/scsi/scsi_debug.c
> 
> between commit:
> 
>   b7011929380d ("scsi: Switch to use hrtimer_setup()")
> 
> from the tip tree and commit:
> 
>   b441eafbd1eb ("scsi: scsi_debug: Simplify command handling")
> 
> from the scsi-mkp tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.
> This is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc drivers/scsi/scsi_debug.c
> index fe5c30bb2639,2208dcba346e..000000000000
> --- 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;
>   }

This is now a conflict between the scsi tree and the tip tree.

-- 
Cheers,
Stephen Rothwell