2014-04-21 10:37 GMT+02:00 Masahiro Yamada <yamad...@jp.panasonic.com>:
>> diff --git a/doc/README.scrapyard b/doc/README.scrapyard >> index 7d67033..32c85ad 100644 >> --- a/doc/README.scrapyard >> +++ b/doc/README.scrapyard >> @@ -114,3 +114,4 @@ PCIPPC2 powerpc MPC740/MPC750 7c9e89b >> 2013-02-07 Wolfgang Den >> PCIPPC6 powerpc MPC740/MPC750 - - >> Wolfgang Denk <w...@denx.de> >> omap2420h4 arm omap24xx - 2013-06-04 Richard >> Woodruff <r-woodru...@ti.com> >> eNET x86 x86 7e8c53d 2013-02-14 Graeme >> Russ <graeme.r...@gmail.com> >> +incaip mips mips32 - 2014-04-17 >> Wolfgang Denk <w...@denx.de> > > > Commit bef67f1f32 sorted the list in reverse chronological order > but the patch "MIPS: drop incaip board" broke the rule so soon. :-( I saw that the list has been sorted but I didn't know in which order. If there is a new rule it should be documented in README.scrapyard. > Tom, a conflict will happen anyway when pulling u-boot-mips/master. why? The branch is rebased to current master so it would be a fast-forward merge. > When you fix the merge conflict, could you move "incaip" to the top of > the list of README.scrapyard? > I can send a follow-up patch which fixes that and also add the commit id of the removal commit. -- - Daniel _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
