[U-Boot] [PULL] : Please pull u-boot-imx - correction

Albert ARIBAUD
2013-05-11T11:26:28Z

Hi Stefano,

On Sat, 11 May 2013 13:15:37 +0200, Stefano Babic <sbabic@denx.de>
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.