Re: linux-next: build failure after merge of the scsi-mkp tree

[Niklas Cassel]

Hello Mark,

On Tue, Sep 22, 2026 at 03:36:14PM +0200, Mark Brown wrote:
> From: Mark Brown <broonie@xxxxxxxxxx>
> Date: Tue, 22 Sep 2026 14:07:31 +0200
> Subject: [PATCH] libata: Fix up semantic conflict in ata_scsi_set_sense()
> 
> /tmp/next/build/drivers/ata/libata-scsi.c: In function 'ata_scsi_pass_thru':
> /tmp/next/build/drivers/ata/libata-scsi.c:3575:25: error: too many arguments to function 'ata_scsi_set_sense'
>  3575 |                         ata_scsi_set_sense(dev, scmd, ABORTED_COMMAND, 0, 0);
>       |                         ^~~~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/ata/libata-scsi.c:206:6: note: declared here
>   206 | void ata_scsi_set_sense(struct ata_device *dev, struct scsi_cmnd *cmd,
>       |      ^~~~~~~~~~~~~~~~~~
> 
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
> ---
>  drivers/ata/libata-scsi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
> index afc2bad677bb9..e380d1b68101a 100644
> --- a/drivers/ata/libata-scsi.c
> +++ b/drivers/ata/libata-scsi.c
> @@ -3572,7 +3572,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
>  		unsigned int multi_count = 1 << (cdb[1] >> 5);
>  
>  		if (!dev->multi_count) {
> -			ata_scsi_set_sense(dev, scmd, ABORTED_COMMAND, 0, 0);
> +			ata_scsi_set_sense(dev, scmd, ABORTED_COMMAND, 0);
>  			return 1;
>  		}

Your resolution looks correct.

This is the second conflict.

The previous conflict can be fixed by SCSI maintainers rebasing
15de2788c91cc407f7e6fc6a07be27b10048cbce on top of v7.3-rc2.

I think that would be nice, such that SCSI maintainers will not
need to report a conflict resolution when sending their PR
(as the conflict is against v7.3-rc2 which is already on master).



This second conflict is trivial.

I can intentionally wait until the second week of the merge window to send
the libata pull request (assuming that SCSI sends it the first week).

That way this simple conflict (the one reported by Mark in this email)
resolution will only need to be reported in the libata pull request, and
not in the SCSI pull request.


Kind regards,
Niklas