The patch titled sata_promise: fix 20619 new EH merge error has been removed from the -mm tree. Its filename was sata_promise-fix-20619-new-eh-merge-error.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ 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 - 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