On 14/03/2013 14:15, Albert ARIBAUD wrote: > Hi Stefano, > > On Thu, 14 Mar 2013 09:09:21 +0100, Stefano Babic <sba...@denx.de> > wrote: > >> From: "fabio.este...@freescale.com" <fabio.este...@freescale.com> >> >> When building for the nitrogen boards with 2GB the following warning happens: >> >> nitrogen6x.c:89:38: warning: integer overflow in expression [-Woverflow] >> >> 2GB can not fit in 32-bits, so use ulong instead. >> >> Reported-by: Albert Aribaud <albert.u.b...@aribaud.net> >> Signed-off-by: Fabio Estevam <fabio.este...@freescale.com> >> Signed-off-by: Stefano Babic <sba...@denx.de> > > This somehow is redundant with Fabio's patch 2/2 with the same summary, > right? >
We sent quite at the same time - I will discharge mine. > Stefano: once Fabio's series is OK, > > - either you rollback your ToT, apply Fabio's series before it, and > then send out an amended PR, which is more work but makes your tree > build-clean; > > - or I apply Fabio's series then your existing PR, which is less > work but leaves your current ToT non-build-clean until you merge back > from ARM (or mainline once I do my own PR). > > What do you prefer? I would favor the first option, FWIW. I prefer to apply Fabio's patches on top of u-boot-imx and send an amended PR. This is also my favorite option. What do you mean with rollback the ToT ? As I have already pushed on the server, I do not like to rebase it or things like that. My idea is only to apply the patches and send after that a new PR to you. Stefano -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de ===================================================================== _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot