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