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

Prafulla Wadaskar
2011-08-21T13:00:05Z

> -----Original Message-----
> From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
> Sent: Sunday, August 21, 2011 3:46 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 21/08/2011 10:15, Prafulla Wadaskar a ?crit :
> >
> >
> >> -----Original Message-----
> >> From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
> >> Sent: Sunday, August 21, 2011 1:36 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 21/08/2011 09:34, Prafulla Wadaskar a ?crit :
> >>> Hi Albert
> >>>
> >>> Please kindly pull
> >>> The following changes since commit
> >> 043a76397696ca0a77ebee0ffc60bf31bdf37f02:
> >>> Prafulla Wadaskar (1):
> >>> Merge branch 'master' of
> >> git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster
> >>>
> >>> are available in the git repository at:
> >>>
> >>> u-boot-marvell.git master branch.
> >>>
> >>> Ajay Bhargav (2):
> >>> gpio: Add GPIO driver framework for Marvell SoCs
> >>> gpio: Add GPIO driver for Marvell SoC Armada100
> >>>
> >>> arch/arm/include/asm/arch-armada100/gpio.h | 48 ++++++++++++
> >>> drivers/gpio/Makefile | 1 +
> >>> drivers/gpio/mvgpio.c | 115
> >> ++++++++++++++++++++++++++++
> >>> drivers/gpio/mvgpio.h | 74
> ++++++++++++++++++
> >>> 4 files changed, 238 insertions(+), 0 deletions(-)
> >>> create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h
> >>> create mode 100644 drivers/gpio/mvgpio.c
> >>> create mode 100644 drivers/gpio/mvgpio.h
> >>>
> >>> Regards..
> >>> Prafulla . .
> >>
> >> One question, to you, and one note, to all ARM custodians:
> >>
> >> The question, about the patches:
> >>
> >> These were submitted on 2011/07/21, after the merge window close of
> >> 2011/07/16, and are not a bugfix, right? If so they should only go to
> >> master after the september release -- I can pull them into
> >> u-boot-arm/next if you want then out of your plate, though.
> >
> > Hi Albert,
> > You are right, you may pull them to your next branch.
> > I am sorry, it's my mistake I should have pulled and requested on next
> branch.
>
> Ok. To avoid any issue, I'll cherry-pick these two onto utboo-arm/next.
>
> Maybe you'll want to roll back your own master and move them to your own
> next, too.

If you have not cherry picked. I will move them to next and will provide a fresh pull request. With suggested rollbacks.

Regards..
Prafulla . .