[U-Boot-Users] [PATCH] lwmon5 dspic POST spezification

Wolfgang Denk
2008-04-30T19:56:59Z

In message <20080430131635.311880@gmx.net> you wrote:
> Hello Wolfgang,
>
> I've found this merge-merge-error.
>
> best regards
> Sascha Laue
>
> From: Sascha Laue <sascha.laue@liebherr.com>
> Date: Wed, 30 Apr 2008 12:27:21 +0200
> Subject: [PATCH] fix manual merge error in lwmon5 posttest.
>
> Signed-off-by: Sascha Laue <sascha.laue@liebherr.com>
> ---
> post/board/lwmon5/sysmon.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)

Applied, manually - your patch is white-space corrupted and does not
apply:

Applying lwmon5: fix manual merge error in POST
error: patch failed: post/board/lwmon5/sysmon.c:132
error: post/board/lwmon5/sysmon.c: patch does not apply
Using index info to reconstruct a base tree...
error: patch failed: post/board/lwmon5/sysmon.c:132
error: post/board/lwmon5/sysmon.c: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001.

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
The human mind treats a new idea the way the body treats a strange
protein - it rejects it. - P. Medawar