Re: [PATCH/RFC 0/4] libata: move err_mask to ata_queued_cmd (revised)

[Jeff Garzik <jgarzik@pobox.com>]

Albert Lee wrote:
> Dear all,
> 
> Description:
>   Move the err_mask parameter of the complete functions to ata_queued_cmd.
>   This can make the err_mask more accessible outside the complete functions;
>   also can make the HSM easier to determine and pass err_mask between states.
> 
> patch 1/4: minor patch to pave the road for patch 2 and 3
> patch 2/4: move err_mask to ata_queued_cmd
> patch 3/4: determine the err_mask when the error is found
> patch 4/4: determine the err_mask directly in atapi_packet_task()
> 
> Revised patch against the mainline tree 
> (e4d76e1c0b15590f2ad9bba89426c2520cd22ca6).

These patches look good, and I'm finally ready to apply them to the 
'upstream' branch.

Would you be kind enough to rediff and resend?  Since I waited a while 
(my fault!), the second patch doesn't seem to apply anymore:


[jgarzik@pretzel libata-dev]$ git-applymbox /g/tmp/mbox ~/info/signoff.txt
4 patch(es) to process.

Applying 'libata: minor patch before moving err_mask'

Wrote tree 6db1429964448401102718bb7ebcb2a7b2efae14
Committed: be7766250023702e65fab822ecf6a8b805028036

Applying 'libata: move err_mask to ata_queued_cmd'

error: patch failed: drivers/scsi/libata-core.c:3424
error: drivers/scsi/libata-core.c: patch does not apply
error: patch failed: drivers/scsi/ahci.c:631
error: drivers/scsi/ahci.c: patch does not apply
error: patch failed: drivers/scsi/sata_mv.c:1136
error: drivers/scsi/sata_mv.c: patch does not apply
error: patch failed: drivers/scsi/sata_sil24.c:557
error: drivers/scsi/sata_sil24.c: patch does not apply