On Monday 27 April 2009, Kazuaki Ichinohe wrote:
I sent the SATA patch mail on April 17. However, the following content is not confirmed, and there is not a reply either. Could you confirm it? I re-send the SATA driver patch.
I failed applying your patch:
Applying: Canyonlands SATA harddisk driver error: patch failed: drivers/block/Makefile:35 error: drivers/block/Makefile: patch does not apply error: patch failed: include/configs/canyonlands.h:454 error: include/configs/canyonlands.h: patch does not apply Patch failed at 0001 Canyonlands SATA harddisk driver When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".
Could you please rebase your patch against the current top-of-tree mainline repository and resumbmit?
Thanks.
Best regards, Stefan
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de =====================================================================