9 Jan
2008
9 Jan
'08
11:20 p.m.
On Wed, 2008-01-09 at 21:50 +0100, Wolfgang Denk wrote:
Got some warnings:
error: cpu/ppc4xx/405gp_pci.c: does not exist in index Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Renamed cpu/ppc4xx/405gp_pci.c => cpu/ppc4xx/4xx_pci.c Auto-merged cpu/ppc4xx/4xx_pci.c Auto-merged README Auto-merged include/configs/MPC8313ERDB.h Auto-merged include/configs/PPChameleonEVB.h Auto-merged nand_spl/board/amcc/acadia/Makefile Auto-merged nand_spl/board/amcc/sequoia/Makefile
Please check if the result is what you had in mind. Thanks.
Looks good. Just a file that got renamed after I submitted my patch which git correctly figured out.
Cheers
Marcel