From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wolfgang Denk Date: Fri, 10 Aug 2012 22:32:56 +0200 Subject: [U-Boot] [PATCH v3] Consolidate bootcount code into drivers/bootcount In-Reply-To: <1338878275-1918-1-git-send-email-sr@denx.de> References: <1338878275-1918-1-git-send-email-sr@denx.de> Message-ID: <20120810203256.AFC8A202DBF@gemini.denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.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 > Cc: Heiko Schocher > Cc: Valentin Longchamp > Cc: Christian Riesch > Cc: Manfred Rudigier > Cc: Mike Frysinger > Cc: Rob Herring > Cc: Reinhard Meyer > Tested-by: Valentin Longchamp > Tested-by: Christian Riesch 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_