From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Sat, 11 May 2013 13:26:28 +0200 Subject: [U-Boot] [PULL] : Please pull u-boot-imx - correction In-Reply-To: <518E2859.6010403@denx.de> References: <5188B35C.5030401@denx.de> <20130511093057.652ad7c4@lilith> <20130511111509.15eacd6d@lilith> <518E11EE.7050907@denx.de> <20130511114706.39f2ec31@lilith> <518E2270.4040407@denx.de> <20130511130137.56de03f5@lilith> <518E2859.6010403@denx.de> Message-ID: <20130511132628.26617ca1@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 13:15:37 +0200, Stefano Babic wrote: > On 11/05/2013 13:01, Albert ARIBAUD wrote: > >> > >> It is ! > > > > Ok, but just a sec. If I put a commit above this, you'll *also* have to > > rebase, won't you? > > Well, I have not yet published any iMX patches after merging u-boot-arm > this morning. At this point, u-boot-imx is equal to u-boot-arm at commit > commit ec7023, after you pulled u-boot-imx. There is no iMX patches > after that, and that is the reason why it should work. > > See u-boot-imx, master: last commit is ec7023. > > If you put a commit above, I should merge again your u-boot-arm/master > (and this should go flawless) and only after that I can apply iMX > patches, that I have not yet published. > > > > > (BTW, I thought rebasing was frowned upon and we should merge instead.) > > Of course ! We should only merge Ok, so I prefer getting things right before I proceed: after I merged your PR, you did not rebase your master, you (fast-forward) merged my master to it. What you have rebased is your next branch, right? > Best regards, > Stefano Amicalement, -- Albert.