[U-Boot] [PATCH v3] Consolidate bootcount code into drivers/bootcount

[Wolfgang Denk <wd@denx.de>]

Dear Stefan Roese,

In message <1338878275-1918-1-git-send-email-sr@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 <sr@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> Cc: Christian Riesch <christian.riesch@omicron.at>
> Cc: Manfred Rudigier <manfred.rudigier@omicron.at>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: Rob Herring <rob.herring@calxeda.com>
> Cc: Reinhard Meyer <reinhard.meyer@emk-elektronik.de>
> Tested-by: Valentin Longchamp <valentin.longchamp@keymile.com>
> Tested-by: Christian Riesch <christian.riesch@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: wd at 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_