[U-Boot] [PULL] u-boot-socfpga/topic/arm/socfpga-20141010
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
for you to fetch changes up to 5a1d0ad3ee1ba98ca273c4b35c68618f107ccadd:
arm: socfpga: Use EMAC1 on SoCDK (2014-10-11 00:50:33 +0200)
---------------------------------------------------------------- Marek Vasut (1): arm: socfpga: Use EMAC1 on SoCDK
Pavel Machek (1): arm: socfpga: add MAINTAINERS entry
MAINTAINERS | 7 +++++++ include/configs/socfpga_cyclone5.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
Hi Marek,
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?
for you to fetch changes up to 5a1d0ad3ee1ba98ca273c4b35c68618f107ccadd:
arm: socfpga: Use EMAC1 on SoCDK (2014-10-11 00:50:33 +0200)
Marek Vasut (1): arm: socfpga: Use EMAC1 on SoCDK
Pavel Machek (1): arm: socfpga: add MAINTAINERS entry
MAINTAINERS | 7 +++++++ include/configs/socfpga_cyclone5.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
No issue on the patches themselves, but since they require ARM to merge mainline before them, I'm doing a full ARM rebuild and a few checks, then I'll PR to Tom.
Amicalement,
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
Hi Marek,
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
for you to fetch changes up to 5a1d0ad3ee1ba98ca273c4b35c68618f107ccadd:
arm: socfpga: Use EMAC1 on SoCDK (2014-10-11 00:50:33 +0200)
Marek Vasut (1): arm: socfpga: Use EMAC1 on SoCDK
Pavel Machek (1): arm: socfpga: add MAINTAINERS entry
MAINTAINERS | 7 +++++++ include/configs/socfpga_cyclone5.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
Applied to u-boot-arm/master, thanks!
Amicalement,
participants (2)
-
Albert ARIBAUD -
Marek Vasut