linux-next: build failure after merge of the libata tree

[Mark Brown]

Hi all,

After merging the libata tree, today's linux-next build (arm64
defconfig) failed like this:

/tmp/next/build/drivers/ata/libata-scsi.c: In function 'ata_scsi_pass_thru':
/tmp/next/build/drivers/ata/libata-scsi.c:3586:25: error: too many arguments to function 'ata_scsi_set_sense'
 3586 |                         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,
      |      ^~~~~~~~~~~~~~~~~~


Caused by commit

   3bab8c7e0c6ba (ata: libata-scsi: abort multi-sector pass-through commands when multi_count is 0)
   
interacting with

   c44f095a9d176 (scsi: ata: libata: Use combined sense codes)

which is now in Linus' tree.  I have moved the merge fixup I was
previously carrying on the scsi-mkp tree to the block tree.

Attachment: signature.asc
Description: PGP signature