From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] Pull request u-boot-marvell.git -- watch out
Date: Sun, 21 Aug 2011 12:24:13 +0200 [thread overview]
Message-ID: <4E50DCCD.4070101@aribaud.net> (raw)
In-Reply-To: <F766E4F80769BD478052FB6533FA745D19FE67991D@SC-VEXCH4.marvell.com>
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.
next prev parent reply other threads:[~2011-08-21 10:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Albert ARIBAUD [this message]
2011-08-21 10:30 ` [U-Boot] Pull request u-boot-marvell.git -- watch out Albert ARIBAUD
2011-08-21 12:59 ` Prafulla Wadaskar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E50DCCD.4070101@aribaud.net \
--to=albert.u.boot@aribaud.net \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox