linux-next: manual merge of the libata tree with the origin tree

[Mark Brown]

Hi all,

Today's linux-next merge of the libata tree got a conflict in:

  drivers/ata/libata-scsi.c

between commit:

  aac9b27f7c1f2 ("ata: libata: cancel pending work after clearing deferred_qc")

from the origin tree and commit:

  9a5eb2adb1ec9 ("ata: libata-scsi: simplify ata_scsi_requeue_deferred_qc()")

from the libata tree.

I fixed it up (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/ata/libata-scsi.c
index ad798e5246b49,4225c6d7ff359..0000000000000
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@@ -1694,15 -1697,10 +1697,11 @@@ void ata_scsi_requeue_deferred_qc(struc
  	 * do not try to be smart about what to do with this deferred command
  	 * and simply retry it by completing it with DID_SOFT_ERROR.
  	 */
- 	if (!qc)
- 		return;
- 
- 	scmd = qc->scsicmd;
- 	ap->deferred_qc = NULL;
- 	cancel_work(&ap->deferred_qc_work);
- 	ata_qc_free(qc);
- 	scmd->result = (DID_SOFT_ERROR << 16);
- 	scsi_done(scmd);
+ 	if (qc) {
+ 		ap->deferred_qc = NULL;
++		cancel_work(&ap->deferred_qc_work);
+ 		ata_scsi_qc_done(qc, true, DID_SOFT_ERROR << 16);
+ 	}
  }
  
  static void ata_scsi_schedule_deferred_qc(struct ata_port *ap)

Attachment: signature.asc
Description: PGP signature