[U-Boot] Please sync u-boot-arm/master with u-boot/master

Masahiro Yamada
2014-10-02T10:10:46Z

Hi Albert,

On Thu, 2 Oct 2014 11:58:27 +0200
Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:

> Never mind those additional commits: they are commits from
> u-boot/master which are needed by your branch (or more exactly, which
> you have based your branch upon) and which are not (yet) in
> u-boot-arm/master.
>
> Think of them as the "common trunk of commits" shared between
> u-boot/master and your master branch.
>
> If I apply u-boot/master first, the trunk commits will be pulled in,
> and laster, when I apply your branch, the trunk will already be in
> place and I4ll only pull your own commits.
>
> OTOH, if I apply your branch first, the trunk commits will be pulled in
> just the same; and when later I apply u-boot/master, the trunk commits
> will already be in place and I'll only pull that part of u-boot/master
> which I don't yet have.

Yup, either will work fine.

> Is this clearer?

Yes, thanks!

I wanted to be sure because I am going to send my
first pull-req in my entire life.

Best Regards