From: Mark Brown <broonie@kernel•org>
To: Damien Le Moal <damien.lemoal@opensource•wdc.com>
Cc: Damien Le Moal <dlemoal@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Niklas Cassel <cassel@kernel•org>
Subject: linux-next: manual merge of the libata tree with the origin tree
Date: Mon, 9 Mar 2026 15:57:58 +0000 [thread overview]
Message-ID: <aa7uBn7h20yFEUF4@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1532 bytes --]
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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-03-09 15:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-09 15:57 Mark Brown [this message]
2026-03-09 16:56 ` linux-next: manual merge of the libata tree with the origin tree Niklas Cassel
-- strict thread matches above, loose matches on Subject: below --
2026-06-01 16:59 Mark Brown
2026-06-01 19:09 ` Niklas Cassel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aa7uBn7h20yFEUF4@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=cassel@kernel$(echo .)org \
--cc=damien.lemoal@opensource$(echo .)wdc.com \
--cc=dlemoal@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox