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

[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 <mikpe@xxxxxxxx>
>
> ---
>
>  drivers/ata/sata_promise.c |    1 +
>  1 files changed, 1 insertion(+)

applied both patches


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/