Dear Albert ARIBAUD, 2011-03-24 오후 10:57, Albert ARIBAUD 쓴 글: > Le 24/03/2011 07:58, Minkyu Kang a écrit : >> Dear Albert Aribaud, >> >> The following changes since commit 966a35d45b90fdcd694dec89b32e5b67771cfd64: >> >> Merge branch 'master' of git://git.denx.de/u-boot-arm (2011-02-16 >> 08:54:52 +0900) >> >> are available in the git repository at: >> >> git://git.denx.de/u-boot-samsung master > > This does not seem to have been rebased to u-boot or u-boot-arm. Can you > check? > Two files are both modified.
board/samsung/smdk6400/u-boot-nand.lds nand_spl/board/samsung/smdk6400/u-boot.lds modified by commit id 79f062e749d9277f89686c3948520dd8d0aab501 on u-boot-arm, commit id 9fc36d1b4492f792617f3947bdf8cea74f236139 and 4b7100ec4c1cedd968d3acab58de5f209b7c8bf7, 9e88e50216279f95d7a974ac0b60907fbee1a2d4 on u-boot-samsung. Hm, how we can solve it? If possible, could you please merge it manually? Thanks Minkyu Kang. _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
