From: Wolfgang Denk <wd@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] Please pull u-boot-ppc4xx
Date: Mon, 21 Dec 2009 21:06:31 +0100 [thread overview]
Message-ID: <20091221200631.94DF43F6EF@gemini.denx.de> (raw)
In-Reply-To: <200912211033.15987.sr@denx.de>
Dear Stefan Roese,
In message <200912211033.15987.sr@denx.de> you wrote:
> The following changes since commit 223e97641cd60abed95dc7a6dd15d8fdf0951ff9:
> Shinya Kuribayashi (1):
> MIPS: qemu_mips: Fix a build failure caused by missing <asm/unaligned.h>
>
> are available in the git repository at:
>
> git://www.denx.de/git/u-boot-ppc4xx.git master
>
> Heiko Schocher (1):
> i2c, ppc4xx: fix compiling KAREF and METROBOX boards.
>
> Stefan Roese (1):
> ppc4xx: alpr: Remove some not needed commands to make image fit again
>
> board/sandburst/common/ppc440gx_i2c.c | 73 +++++++++++++++++----------------
> board/sandburst/common/ppc440gx_i2c.h | 30 +++++++-------
> include/configs/alpr.h | 2 -
> 3 files changed, 53 insertions(+), 52 deletions(-)
Umm.. you seem to have a strange commit in your repository. When
pulling, I see this:
Merge made by recursive.
board/sandburst/common/ppc440gx_i2c.c | 73 +++++++++++++++++----------------
board/sandburst/common/ppc440gx_i2c.h | 30 +++++++-------
include/asm-mips/unaligned.h | 26 ++++++++++++
include/configs/alpr.h | 2 -
4 files changed, 79 insertions(+), 52 deletions(-)
create mode 100644 include/asm-mips/unaligned.h
Seems you have a MIPS commit in your tree:
commit 223e97641cd60abed95dc7a6dd15d8fdf0951ff9
Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Date: Fri Dec 18 19:32:13 2009 +0900
MIPS: qemu_mips: Fix a build failure caused by missing <asm/unaligned.h>
This does not seem right to me.
NOT pulled.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
We fight only when there is no other choice. We prefer the ways of
peaceful contact.
-- Kirk, "Spectre of the Gun", stardate 4385.3
next prev parent reply other threads:[~2009-12-21 20:06 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-21 9:33 [U-Boot] Please pull u-boot-ppc4xx Stefan Roese
2009-12-21 20:06 ` Wolfgang Denk [this message]
2009-12-22 4:51 ` Stefan Roese
-- strict thread matches above, loose matches on Subject: below --
2015-10-27 11:38 Stefan Roese
2015-10-28 20:55 ` Tom Rini
2013-07-26 5:50 Stefan Roese
2013-07-26 23:35 ` Tom Rini
2012-01-10 7:42 Stefan Roese
2012-01-13 19:12 ` Wolfgang Denk
2009-09-23 14:05 Stefan Roese
2009-09-23 22:17 ` Wolfgang Denk
2009-09-17 12:11 Stefan Roese
2009-09-17 21:31 ` Wolfgang Denk
2009-09-11 8:47 Stefan Roese
2009-09-15 19:44 ` Wolfgang Denk
2009-09-08 9:09 Stefan Roese
2009-09-08 18:55 ` Wolfgang Denk
2009-09-09 6:23 ` Stefan Roese
2009-07-24 8:39 Stefan Roese
2009-07-26 20:54 ` Wolfgang Denk
2009-07-10 7:12 Stefan Roese
2009-07-13 21:34 ` Wolfgang Denk
2009-05-20 11:07 Stefan Roese
2009-05-20 20:42 ` Wolfgang Denk
2009-04-15 14:33 Stefan Roese
2009-04-16 14:25 ` Stefan Roese
2009-04-16 20:53 ` Wolfgang Denk
2009-04-16 20:53 ` Wolfgang Denk
2009-04-14 8:44 Stefan Roese
2009-04-16 20:53 ` Wolfgang Denk
2009-03-26 17:39 Stefan Roese
2009-03-26 21:34 ` Wolfgang Denk
2009-03-20 12:04 Stefan Roese
2009-03-20 20:56 ` Wolfgang Denk
2009-03-17 9:57 Stefan Roese
2009-03-17 23:38 ` Wolfgang Denk
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=20091221200631.94DF43F6EF@gemini.denx.de \
--to=wd@denx.de \
--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