[U-Boot] Pull request u-boot-marvell.git

[Albert ARIBAUD]

Hi Prafulla,

Le 14/09/2011 08:06, Prafulla Wadaskar a écrit :
>
>
>> -----Original Message-----
>> From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
>> Sent: Tuesday, September 13, 2011 11:13 PM
>> To: Prafulla Wadaskar
>> Cc: 'u-boot at lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik
>> Subject: Re: Pull request u-boot-marvell.git
>>
>> Hi Prafulla,
>>
>> Le 13/09/2011 15:08, Prafulla Wadaskar a écrit :
>>> Hi Albert
>>>
>>> Please kindly pull
>>> The following changes since commit
>> 07db205b5186ac9722a1f141d97c9a67c43c4ae1:
>>>     Joe Hershberger (1):
>>>           omap4_panda: Ignore omap4 SPL called MLO
>>>
>>> are available in the git repository at:
>>>
>>>     u-boot-marvell.git next branch.
>>>
>>> Ajay Bhargav (3):
>>>         net: Adds Fast Ethernet Controller driver for Armada100
>>>         Armada100: Enable Ethernet support for GplugD
>>>         Armada100: Enable 88E3015 PHY support for GplugD
>>>
>>>    arch/arm/include/asm/arch-armada100/armada100.h |   58 ++
>>>    arch/arm/include/asm/arch-armada100/mfp.h       |   19 +
>>>    board/Marvell/gplugd/gplugd.c                   |   71 +++
>>>    drivers/net/Makefile                            |    1 +
>>>    drivers/net/armada100_fec.c                     |  736
>> +++++++++++++++++++++++
>>>    drivers/net/armada100_fec.h                     |  232 +++++++
>>>    include/configs/gplugd.h                        |   30 +-
>>>    include/netdev.h                                |    1 +
>>>    8 files changed, 1146 insertions(+), 2 deletions(-)
>>>    create mode 100644 drivers/net/armada100_fec.c
>>>    create mode 100644 drivers/net/armada100_fec.h
>>>
>>> Regards..
>>> Prafulla . .
>>
>> I assume that this 'next' branch is actually your 'master' for the
>> upcoming release, and you want me to apply it to u-boot-arm/master,
>> right?
>
> I have provided pull request for next branch since these patches were originated after closure of last merge window (just one day latter).
> That's good if you can do it.

Right after rc1, and as this does not seem to be a matter of urgency, 
I'd rather not apply them to u-boot-arm/master just in case it would 
break something. I will thus apply them to u-boot-arm/next, so that they 
will move to u-boot-arm/master as soon as the new release is out; you 
won't need to keep them in your repo once I have (rebased and) applied them.

>> If so, please use 'master' as the branch to pull next time, so that
>> there is no doubt what you are asking.

(or explicitly specify the branch to pull to; either way is fine to me, 
as long as there is no doubt on the destination of the pull)

> Yes, I will do this.

Thanks!

> Thanks and regards..
> Prafulla ..

Amicalement,
-- 
Albert.