Hi Jens,
Today's linux-next merge of the block tree got a conflict in
drivers/ata/libata-core.c between commit 72dd299d5039 ("libata: allow
sata_sil24 to opt-out of tag ordered submission") from Linus' tree and
commit 98bd4be1ba95 ("libata: move sas ata tag allocation to
libata-scsi.c") from the block tree.I fixed it up (I used the version from the block tree and then added the following patch) and can carry the fix as necessary (no action is required). From: Stephen Rothwell <[email protected]> Date: Tue, 27 Jan 2015 14:59:51 +1100 Subject: [PATCH] libata: fix for move of sas tag allocation code Signed-off-by: Stephen Rothwell <[email protected]> --- drivers/ata/libata-scsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index fd9be1756f0d..055e75d2176e 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -4240,7 +4240,10 @@ int ata_sas_allocate_tag(struct ata_port *ap) unsigned int i, tag; for (i = 0, tag = ap->sas_last_tag + 1; i < max_queue; i++, tag++) { - tag = tag < max_queue ? tag : 0; + if (ap->flags & ATA_FLAG_LOWTAG) + tag = i; + else + tag = tag < max_queue ? tag : 0; /* the last tag is reserved for internal command. */ if (tag == ATA_TAG_INTERNAL) -- 2.1.4 -- Cheers, Stephen Rothwell [email protected]
pgpnOfJ45ZbBq.pgp
Description: OpenPGP digital signature
