From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Sat, 11 May 2013 11:47:10 +0200 Subject: [U-Boot] [PULL] : Please pull u-boot-imx - correction In-Reply-To: <518E11EE.7050907@denx.de> References: <5188B35C.5030401@denx.de> <20130511093057.652ad7c4@lilith> <20130511111509.15eacd6d@lilith> <518E11EE.7050907@denx.de> Message-ID: <20130511114710.718ff139@lilith> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Stefano, On Sat, 11 May 2013 11:39:58 +0200, Stefano Babic 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-imx at git.denx.de/u-boot-imx u-boot-arm/master:master-aa > Best regards, > Stefano Amicalement, -- Albert.