Dear Michael Zaidman,
In message AANLkTi=S9aoPB6G6zcwii9hnoB02BAtUAM3j_hSKu4mZ@mail.gmail.com you wrote:
On Wed, Jun 30, 2010 at 7:16 PM, Michael Zaidman michael.zaidman@gmail.com wrote:
- Revives POST for blackfin arch;
- Removes redundant code: arch/blackfin/lib/post.c board/ssv/common/post.c arch/powerpc/cpu/ppc4xx/commproc.c arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage;
Signed-off-by: Michael Zaidman michael.zaidman@gmail.com Acked-by: Detlev Zundel dzu@denx.de Tested-by: Anatolij Gustschin agust@denx.de
List of the maintainers of the affected by patch boards: Cc: Stephan Linz linz@li-pro.net Cc: Denis Peter d.peter@mpl.ch Cc: Matthias Fuchs matthias.fuchs@esd-electronics.com Cc: Peter Tyser ptyser@xes-inc.com Cc: Stefan Roese sr@denx.de Cc: Mike Frysinger vapier@gentoo.org Cc: Niklaus Giger niklaus.giger@netstal.com Cc: Larry Johnson lrj@acm.org Cc: Feng Kan fkan@amcc.com
More than 5 week ago I rebased and resubmitted this patch as you asked but did not receive any response yet.
Sorry, but this does not apply any more:
Applying: POST cleanup. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging arch/blackfin/lib/board.c CONFLICT (delete/modify): arch/blackfin/lib/post.c deleted in POST cleanup. and modified in HEAD. Version HEAD of arch/blackfin/lib/post.c left in tree. Removing arch/powerpc/cpu/mpc512x/common.c Auto-merging arch/powerpc/cpu/ppc4xx/Makefile Removing arch/powerpc/cpu/ppc4xx/commproc.c Auto-merging board/barco/barco.c Auto-merging board/bf537-stamp/Makefile CONFLICT (content): Merge conflict in board/bf537-stamp/Makefile Auto-merging include/common.h Auto-merging include/configs/bf537-stamp.h Auto-merging include/configs/bfin_adi_common.h Auto-merging include/configs/katmai.h Failed to merge in the changes. Patch failed at 0001 POST cleanup.
The merge conflict in board/bf537-stamp/Makefile is trivial to resolve, but I'm not sure about the "arch/blackfin/lib/post.c deleted in POST cleanup. and modified in HEAD."
Please rebase and resubmit. Thanks.
Best regards,
Wolfgang Denk