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

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]>

---

 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 [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• References:
  • [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error
    • From: Mikael Pettersson <[email protected]>

• Prev by Date: [PATCH] x86_64: fix section mismatch warnings
• Next by Date: Re: [PATCH]: Add id_to_dma_mode function for printing DMA modes
• Previous by thread: [PATCH 2.6.21-rc1] sata_promise: fix 20619 new EH merge error
• Next by thread: [PATCH 2.6.21-rc1] x86 signal number delivery fixes
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]