LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error
@ 2007-02-25 11:44 Mikael Pettersson
2007-02-25 20:53 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Mikael Pettersson @ 2007-02-25 11:44 UTC (permalink / raw)
To: Jeff Garzik; +Cc: linux-ide, linux-kernel
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@it.uu.se>
---
drivers/ata/sata_promise.c | 1 +
1 files changed, 1 insertion(+)
diff -rupN linux-2.6.21-rc1/drivers/ata/sata_promise.c linux-2.6.21-rc1.sata_promise-20619-newEH-fix/drivers/ata/sata_promise.c
--- linux-2.6.21-rc1/drivers/ata/sata_promise.c 2007-02-24 22:32:42.000000000 +0100
+++ linux-2.6.21-rc1.sata_promise-20619-newEH-fix/drivers/ata/sata_promise.c 2007-02-24 23:05:08.000000000 +0100
@@ -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,
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error
2007-02-25 11:44 [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error Mikael Pettersson
@ 2007-02-25 20:53 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-02-25 20:53 UTC (permalink / raw)
To: Mikael Pettersson; +Cc: linux-ide, linux-kernel
Mikael Pettersson wrote:
> 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@it.uu.se>
>
> ---
>
> drivers/ata/sata_promise.c | 1 +
> 1 files changed, 1 insertion(+)
applied both patches
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-02-25 20:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-25 11:44 [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error Mikael Pettersson
2007-02-25 20:53 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).