Hi Stefano,
On Sat, 11 May 2013 11:39:58 +0200, Stefano Babic <sba...@denx.de>
wrote:
> On 11/05/2013 11:15, Albert ARIBAUD wrote:
>
> Hi Albert,
>
> >> Applied to u-boot-arm/master (with two trivial merge resolutions),
> >> thanks!
> >
> > Seems like the trivial merge resolution was less trivial than I thought
> > it was -- I accidentally removed from drivers/mtd/nand/mxc_nand_spl.c
> > the definitions for nand_init() and nand_deselect(). For some reason
> > I missed it in the MAKEALL -a arm I did. Rolling back and fixing this.
>
> Please make modifications on top of your current tree - after your first
> e-mail, I have already pulled from u-boot-arm and pushed to the server.
> If you go back, I had to rebase my tree.
Argh! I had already had rolled back and have just finished testing.
I can roll forward again if you confirm that the u-boot-arm/master
branch you have is commit ec7023d.
Otherwise, please push the u-boot-arm/master your are based on onto the
u-boot-imx repo under a new branch name, e.g.
git push ssh://gu-...@git.denx.de/u-boot-imx
u-boot-arm/master:master-aa
> Best regards,
> Stefano
Amicalement,
--
Albert.
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
