Re: [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error

2007-02-25 Thread Jeff Garzik
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 <[EMAIL PROTECTED]> ---

[PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error

2007-02-25 Thread Mikael Pettersson
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 <[EMAIL PROTECTED]> --- drivers/ata/sata_promise.c |1 + 1 files

[PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error

2007-02-25 Thread Mikael Pettersson
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 [EMAIL PROTECTED] --- drivers/ata/sata_promise.c |1 + 1 files

Re: [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error

2007-02-25 Thread Jeff Garzik
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 [EMAIL PROTECTED] ---