* [U-Boot] Pull request u-boot-marvell.git
@ 2011-08-21 7:34 Prafulla Wadaskar
2011-08-21 8:05 ` Albert ARIBAUD
2011-08-21 10:24 ` [U-Boot] Pull request u-boot-marvell.git -- watch out Albert ARIBAUD
0 siblings, 2 replies; 9+ messages in thread
From: Prafulla Wadaskar @ 2011-08-21 7:34 UTC (permalink / raw)
To: u-boot
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 . .
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] Pull request u-boot-marvell.git
2011-08-21 7:34 [U-Boot] Pull request u-boot-marvell.git Prafulla Wadaskar
@ 2011-08-21 8:05 ` Albert ARIBAUD
2011-08-21 8:15 ` Prafulla Wadaskar
2011-08-21 10:24 ` [U-Boot] Pull request u-boot-marvell.git -- watch out Albert ARIBAUD
1 sibling, 1 reply; 9+ messages in thread
From: Albert ARIBAUD @ 2011-08-21 8:05 UTC (permalink / raw)
To: u-boot
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.
The note, about pull request to the ARM repo:
I see (here, as in some pull reqs to ARM from others as well) that you
have merged the u-boot-arm/master tip in your tree. This causes two
problems, one minor, and one major.
The minor one is that the commit on which your pull request is emitted
is *not* a commit of u-boot-arm/master, whereas it should be.
The (more) major problem is that this merging is contrary to
<http://www.denx.de/wiki/view/U-Boot/CustodianGitTrees#Tips_for_maintaining_custodian_t>,
which mandates that repos be rebased onto their upstream repo, not that
they merge it.
This is not simply a question of style vs. substance: one of the reasons
to prefer rebases to merges is that merges prevent effective use of git
bisect, thus prevent tracking regressions.
(note: I think the Wiki can mislead readers into doing git pulls, which
actually cause merges, and it would be better if the Wiki suggested git
fetches instead -- and did not suggest use of intermediate branches such
as 'uboot' which are only syntactic sugaring for 'u-boot/master'.)
So custodians, instead of merging the upstream repo onto which you will
send a pull request, please do rebase your repo onto the upstream master
branch!
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] Pull request u-boot-marvell.git
2011-08-21 8:05 ` Albert ARIBAUD
@ 2011-08-21 8:15 ` Prafulla Wadaskar
2011-08-21 10:16 ` Albert ARIBAUD
0 siblings, 1 reply; 9+ messages in thread
From: Prafulla Wadaskar @ 2011-08-21 8:15 UTC (permalink / raw)
To: u-boot
> -----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.
Regards..
Prafulla . .
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] Pull request u-boot-marvell.git
2011-08-21 8:15 ` Prafulla Wadaskar
@ 2011-08-21 10:16 ` Albert ARIBAUD
2011-08-21 13:00 ` Prafulla Wadaskar
0 siblings, 1 reply; 9+ messages in thread
From: Albert ARIBAUD @ 2011-08-21 10:16 UTC (permalink / raw)
To: u-boot
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.
> Regards..
> Prafulla . .
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] Pull request u-boot-marvell.git -- watch out
2011-08-21 7:34 [U-Boot] Pull request u-boot-marvell.git Prafulla Wadaskar
2011-08-21 8:05 ` Albert ARIBAUD
@ 2011-08-21 10:24 ` Albert ARIBAUD
2011-08-21 10:30 ` Albert ARIBAUD
2011-08-21 12:59 ` Prafulla Wadaskar
1 sibling, 2 replies; 9+ messages in thread
From: Albert ARIBAUD @ 2011-08-21 10:24 UTC (permalink / raw)
To: u-boot
Hi again 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 . .
In order to cherry-pick those two commits to my 'next' branch as agreed,
I did fetch your u-boot-marvell/master, and then realized that not only
does it a merge, but it even does it to a bad u-bot-arm branch that
Wolfgang pointed out to me, so I'd rolled back and forced an update
which did not reach you.
Namely, your master contains 28b7cbdd ("Don't compile in large memory
test function by default") and 61cb36df ("Added documentation for
CONFIG_SYS_TEXT_BASE").
Please roll back your master branch to just before merge commit 043a7639!
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] Pull request u-boot-marvell.git -- watch out
2011-08-21 10:24 ` [U-Boot] Pull request u-boot-marvell.git -- watch out Albert ARIBAUD
@ 2011-08-21 10:30 ` Albert ARIBAUD
2011-08-21 12:59 ` Prafulla Wadaskar
1 sibling, 0 replies; 9+ messages in thread
From: Albert ARIBAUD @ 2011-08-21 10:30 UTC (permalink / raw)
To: u-boot
Le 21/08/2011 12:24, Albert ARIBAUD a ?crit :
> Hi again 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 . .
>
> In order to cherry-pick those two commits to my 'next' branch as agreed,
> I did fetch your u-boot-marvell/master, and then realized that not only
> does it a merge, but it even does it to a bad u-bot-arm branch that
> Wolfgang pointed out to me, so I'd rolled back and forced an update
> which did not reach you.
>
> Namely, your master contains 28b7cbdd ("Don't compile in large memory
> test function by default") and 61cb36df ("Added documentation for
> CONFIG_SYS_TEXT_BASE").
>
> Please roll back your master branch to just before merge commit 043a7639!
Make that "please roll back so that your master branch is fully rebased
on u-boot-arm/master" -- sorry for the bad wording above.
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] Pull request u-boot-marvell.git -- watch out
2011-08-21 10:24 ` [U-Boot] Pull request u-boot-marvell.git -- watch out Albert ARIBAUD
2011-08-21 10:30 ` Albert ARIBAUD
@ 2011-08-21 12:59 ` Prafulla Wadaskar
1 sibling, 0 replies; 9+ messages in thread
From: Prafulla Wadaskar @ 2011-08-21 12:59 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
> Sent: Sunday, August 21, 2011 3:54 PM
> To: Prafulla Wadaskar
> Cc: 'u-boot at lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik
> Subject: Re: Pull request u-boot-marvell.git -- watch out
>
> Hi again 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 . .
>
> In order to cherry-pick those two commits to my 'next' branch as agreed,
> I did fetch your u-boot-marvell/master, and then realized that not only
> does it a merge, but it even does it to a bad u-bot-arm branch that
> Wolfgang pointed out to me, so I'd rolled back and forced an update
> which did not reach you.
>
> Namely, your master contains 28b7cbdd ("Don't compile in large memory
> test function by default") and 61cb36df ("Added documentation for
> CONFIG_SYS_TEXT_BASE").
>
> Please roll back your master branch to just before merge commit
> 043a7639!
Okay, I will do the needful
Regards..
Prafulla . .
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] Pull request u-boot-marvell.git
2011-08-21 10:16 ` Albert ARIBAUD
@ 2011-08-21 13:00 ` Prafulla Wadaskar
2011-08-22 6:42 ` Albert ARIBAUD
0 siblings, 1 reply; 9+ messages in thread
From: Prafulla Wadaskar @ 2011-08-21 13:00 UTC (permalink / raw)
To: u-boot
> -----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 . .
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] Pull request u-boot-marvell.git
2011-08-21 13:00 ` Prafulla Wadaskar
@ 2011-08-22 6:42 ` Albert ARIBAUD
0 siblings, 0 replies; 9+ messages in thread
From: Albert ARIBAUD @ 2011-08-22 6:42 UTC (permalink / raw)
To: u-boot
Hi Prafulla,
Le 21/08/2011 15:00, Prafulla Wadaskar a ?crit :
>
>
>> -----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.
Please do, thanks in advance!
> Regards..
> Prafulla . .
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-08-22 6:42 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-21 7:34 [U-Boot] Pull request u-boot-marvell.git Prafulla Wadaskar
2011-08-21 8:05 ` Albert ARIBAUD
2011-08-21 8:15 ` Prafulla Wadaskar
2011-08-21 10:16 ` Albert ARIBAUD
2011-08-21 13:00 ` Prafulla Wadaskar
2011-08-22 6:42 ` Albert ARIBAUD
2011-08-21 10:24 ` [U-Boot] Pull request u-boot-marvell.git -- watch out Albert ARIBAUD
2011-08-21 10:30 ` Albert ARIBAUD
2011-08-21 12:59 ` Prafulla Wadaskar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox