From: Marcel Ziswiler <marcel@ziswiler.com>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] [PATCH] fix comments with new drivers organization
Date: Wed, 09 Jan 2008 23:20:42 +0100 [thread overview]
Message-ID: <1199917242.11701.23.camel@localhost.localdomain> (raw)
In-Reply-To: <20080109205002.4FD7824755@gemini.denx.de>
On Wed, 2008-01-09 at 21:50 +0100, Wolfgang Denk wrote:
> Got some warnings:
>
> error: cpu/ppc4xx/405gp_pci.c: does not exist in index
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Renamed cpu/ppc4xx/405gp_pci.c => cpu/ppc4xx/4xx_pci.c
> Auto-merged cpu/ppc4xx/4xx_pci.c
> Auto-merged README
> Auto-merged include/configs/MPC8313ERDB.h
> Auto-merged include/configs/PPChameleonEVB.h
> Auto-merged nand_spl/board/amcc/acadia/Makefile
> Auto-merged nand_spl/board/amcc/sequoia/Makefile
>
>
> Please check if the result is what you had in mind. Thanks.
Looks good. Just a file that got renamed after I submitted my patch which git correctly figured out.
Cheers
Marcel
prev parent reply other threads:[~2008-01-09 22:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-30 2:30 [U-Boot-Users] [PATCH] fix comments with new drivers organization Marcel Ziswiler
2008-01-09 20:50 ` Wolfgang Denk
2008-01-09 22:20 ` Marcel Ziswiler [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=1199917242.11701.23.camel@localhost.localdomain \
--to=marcel@ziswiler.com \
--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