This patch similarly fails to apply:
include/linux/ata.h 1.23: 281 lines
include/linux/ata.h 1.23 -> 1.24: 281 lines
1 out of 1 hunk FAILED -- saving rejects to file include/linux/ata.h.rej
drivers/scsi/libata-core.c 1.121: 4064 lines
drivers/scsi/libata-core.c 1.121 -> 1.122: 4064 lines
2 out of 3 hunks FAILED -- saving rejects to file
drivers/scsi/libata-core.c.rej
Here at home, I have many trees, all diff'd against 2.6.11-rc4:
adma/ atapi-enable/ iomap/ promise-sata-pata/ via-6421/
adma-mwi/ bridge-detect/ passthru/ remove-one-fix/
ahci-msi/ chs-support/ pdc2027x/ sata-sil-irq/
ALL/ ioctl-get-identity/ pdc20619/ tf-cleanup/
When I receive a C/H/S patch from you, I apply it to the "chs-support"
tree, which is
2.6.11-rc4 + your C/H/S patches
When I receive a pata_pdc2027x patch from you, I apply it to the
"pdc2027x" tree, which is
2.6.11-rc4 + your pata_pdc2027x patches
I have attached the cumulative patch for "chs-support" tree, if this
helps you re-diff your changes.
Regards,
Jeff