[U-Boot] [PULL] u-boot-socfpga/topic/arm/socfpga-20141010

Marek Vasut
2014-10-11T19:22:57Z

On Saturday, October 11, 2014 at 01:36:53 AM, Albert ARIBAUD wrote:
> Hi Marek,

Hi Albert,

> On Sat, 11 Oct 2014 01:11:46 +0200, Marek Vasut <marex@denx.de> wrote:
> > The following changes since commit db67801bf92f7fae6131dbc0d387131698fb9490:
> > Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
> > (2014-10-10
> >
> > 09:45:16 -0400)
> >
> > are available in the git repository at:
> > git://git.denx.de/u-boot-socfpga.git topic/arm/socfpga-20141010
>
> In the U-Boot process, PRs are done from a master branch to a master
> branch.
>
> There are exceptions of course, for instance when a repo collects
> patches for more than one architecture, as does u-boot-sh; it has a
> master branch for its SH stuff, and a 'rmobile' branch for its ARM
> stuff.
>
> But here, the branch is topical. This is very unusual and only
> happened, AFAIR, in very few cases of big changes across all arches,
> where by agreement the patch series was directly maintained as a branch.
>
> Will u-boot-socfpga keep on using this branch system, or will it in the
> future converge toward the U-Boot master+next branch system?

Yes, the next MW will be taking the standard course through master+next combo.

Best regards,
Marek Vasut