From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] ppc4xx: Fix CATcenter build and add it to MAKEALL
Date: Thu, 23 Sep 2010 08:26:08 +0200 [thread overview]
Message-ID: <201009230826.08185.sr@denx.de> (raw)
In-Reply-To: <20100922205203.1FD0AEC2339@gemini.denx.de>
Hi Wolfgang,
On Wednesday 22 September 2010 22:52:03 Wolfgang Denk wrote:
> > + CATcenter \
> >
> > CMS700 \
> > CPCI2DP \
> > CPCI405 \
>
> This will result in a merge conflict when pulling into "next", where
> this entry does not exist any more as it gets auto-generated fro
> boards.cfg
>
> Can we please omit this from this patch?
Yes, will send an updated patch in a few minutes.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de
prev parent reply other threads:[~2010-09-23 6:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-13 7:41 [U-Boot] [PATCH] ppc4xx: Fix CATcenter build and add it to MAKEALL Stefan Roese
2010-09-22 8:18 ` Stefan Roese
2010-09-22 20:52 ` Wolfgang Denk
2010-09-23 6:26 ` Stefan Roese [this message]
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=201009230826.08185.sr@denx.de \
--to=sr@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