[U-Boot-Users] [PATCH] Change env_get_char from a global function ptr to a function.

[Wolfgang Denk]

In message <024e01c89742$e48d4b80$ada7e280$@Tjernlund at transmode.se> you wrote:
> Did you try this one or did du skip it this release?

Unfortunately this doesn't apply any more:

Applying Change env_get_char from a global function ptr to a function.
error: patch failed: common/cmd_bootm.c:1150
error: common/cmd_bootm.c: patch does not apply
error: patch failed: common/fdt_support.c:225
error: common/fdt_support.c: patch does not apply
error: patch failed: common/ft_build.c:396
error: common/ft_build.c: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged common/cmd_bootm.c
CONFLICT (content): Merge conflict in common/cmd_bootm.c
Auto-merged common/cmd_nvedit.c
Auto-merged common/fdt_support.c
CONFLICT (content): Merge conflict in common/fdt_support.c
Auto-merged common/ft_build.c
CONFLICT (content): Merge conflict in common/ft_build.c
Auto-merged include/common.h
Failed to merge in the changes.
Patch failed at 0001.


Could you please update and resubmit? Thanks in advance.

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
You don't have to worry about me. I might have been born yesterday...
but I stayed up all night.