Dear Stefan Roese,
In message <1338878275-1918-1-git-send-email...@denx.de> you wrote:
> This patch moves all bootcount implementations into a common
> directory: drivers/bootcount. The generic bootcount driver
> is now usable not only by powerpc platforms, but others as well.
>
> Signed-off-by: Stefan Roese <s...@denx.de>
> Cc: Heiko Schocher <h...@denx.de>
> Cc: Valentin Longchamp <valentin.longch...@keymile.com>
> Cc: Christian Riesch <christian.rie...@omicron.at>
> Cc: Manfred Rudigier <manfred.rudig...@omicron.at>
> Cc: Mike Frysinger <vap...@gentoo.org>
> Cc: Rob Herring <rob.herr...@calxeda.com>
> Cc: Reinhard Meyer <reinhard.me...@emk-elektronik.de>
> Tested-by: Valentin Longchamp <valentin.longch...@keymile.com>
> Tested-by: Christian Riesch <christian.rie...@omicron.at>
Sorry, this does not apply any more:
Applying patch #163024 to current directory
Description: [U-Boot,v3] Consolidate bootcount code into
drivers/bootcount
Applying: Consolidate bootcount code into drivers/bootcount
fatal: sha1 information is lacking or useless (Makefile).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Consolidate bootcount code into drivers/bootcount
Can you please rebase? Thanks!
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: w...@denx.de
I perceive a possibility of an immediate chronological sequence of
events which includes a violence.
- Terry Pratchett, _The Dark Side of the Sun_
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
