The patch titled
sata_promise: fix 20619 new EH merge error
has been added to the -mm tree. Its filename is
sata_promise-fix-20619-new-eh-merge-error.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: sata_promise: fix 20619 new EH merge error
From: Mikael Pettersson <mikpe@xxxxxxxx>
When I merged my 20619 new EH conversion with #libata-upstream I had to
manually resolve a conflict, and inadvertently lost pdc_pata_ops'
->post_internal_cmd binding. Corrected by this patch.
Signed-off-by: Mikael Pettersson <mikpe@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ata/sata_promise.c | 1 +
1 file changed, 1 insertion(+)
diff -puN drivers/ata/sata_promise.c~sata_promise-fix-20619-new-eh-merge-error drivers/ata/sata_promise.c
--- a/drivers/ata/sata_promise.c~sata_promise-fix-20619-new-eh-merge-error
+++ a/drivers/ata/sata_promise.c
@@ -218,6 +218,7 @@ static const struct ata_port_operations
.freeze = pdc_freeze,
.thaw = pdc_thaw,
.error_handler = pdc_error_handler,
+ .post_internal_cmd = pdc_post_internal_cmd,
.data_xfer = ata_data_xfer,
.irq_handler = pdc_interrupt,
.irq_clear = pdc_irq_clear,
_
Patches currently in -mm which might be from mikpe@xxxxxxxx are
credits-update-mikpes-email-address.patch
sata_promise-simplify-port-setup.patch
sata_promise-fix-20619-new-eh-merge-error.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
