[U-Boot-Users] [PATCH v2 2/2] Use watchdog-aware functions when calculating hashes of images

[Wolfgang Denk]

In message <20080422102802.30118.26894.stgit at pollux.denx.de> you wrote:
> Signed-off-by: Bartlomiej Sieka <tur at semihalf.com>
> ---
> 
>  common/image.c      |   43 +++++++++----------------------------------
>  include/image.h     |   17 +++++++++++++++--
>  lib_generic/crc32.c |    1 +
>  lib_generic/md5.c   |    4 ++++
>  lib_generic/sha1.c  |    4 ++++
>  5 files changed, 33 insertions(+), 36 deletions(-)

Sorry, but this patch does not apply any more:

Applying Use watchdog-aware functions when calculating hashes of images
error: patch failed: common/image.c:156
error: common/image.c: patch does not apply
error: patch failed: lib_generic/crc32.c:12
error: lib_generic/crc32.c: patch does not apply
fatal: sha1 information is lacking or useless (common/image.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.

Please rebase and resubmit.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Perl itself is  usually  pretty  good  about  telling  you  what  you
shouldn't do. :-)     - Larry Wall in <11091 at jpl-devvax.JPL.NASA.GOV>