From: Norbert van Bolhuis <nvbolhuis@aimvalley.nl>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] 83xx: correctly set encryption and I2C bus 0 clock
Date: Thu, 12 Mar 2009 07:57:47 +0100 [thread overview]
Message-ID: <49B8B26B.4090104@aimvalley.nl> (raw)
In-Reply-To: <20090311150506.712c50ab.kim.phillips@freescale.com>
Kim,
Yes I just cut-n-pasted it.
I hope it's better now.
Regards,
Norbert.
Kim Phillips wrote:
> On Wed, 11 Mar 2009 13:22:05 -0500
> Scott Wood <scottwood@freescale.com> wrote:
>
>> On Wed, Mar 11, 2009 at 12:57:43PM -0500, Kim Phillips wrote:
>>> heh, I thought it wouldn't be a problem, but you're right Heiko:
>>>
>>> Applying: 83xx: correctly set encryption and I2C bus 0 clock
>>> error: mpc83xx/cpu_init.c: does not exist in index
>>> Patch failed at 0001.
>>> When you have resolved this problem run "git am -i --resolved".
>>> If you would prefer to skip this patch, instead run "git am -i --skip".
>>> To restore the original branch and stop patching run "git am -i --abort".
>>>
>>> even patch(1) asks which file to patch.
>> Try "git am -p0".
>
> right. That yields another problem:
>
> Applying: 83xx: correctly set encryption and I2C bus 0 clock
> error: patch failed: cpu/mpc83xx/cpu_init.c:106
> error: cpu/mpc83xx/cpu_init.c: patch does not apply
> Patch failed at 0001.
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
>
> It appears Norbert cut-n-pasted the diff and thus introduced whitespace
> errors.
>
> I can obviously apply this by hand but I'd rather get Norbert up to
> speed with submitting patches, esp. for the sake of future, potentially
> unwieldy, contributions.
>
> Kim
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-83xx-correctly-set-encryption-and-I2C-bus-0-clock.patch
Type: text/x-patch
Size: 0 bytes
Desc: not available
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090312/18c2dd32/attachment.bin
next prev parent reply other threads:[~2009-03-12 6:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-11 7:27 [U-Boot] [PATCH] 83xx: correctly set encryption and I2C bus 0 clock Norbert van Bolhuis
2009-03-11 8:33 ` Heiko Schocher
2009-03-11 17:57 ` Kim Phillips
2009-03-11 18:22 ` Scott Wood
2009-03-11 20:05 ` Kim Phillips
2009-03-12 6:57 ` Norbert van Bolhuis [this message]
2009-03-12 10:06 ` Wolfgang Denk
2009-03-13 7:58 ` Norbert van Bolhuis
2009-03-14 23:01 ` Kim Phillips
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=49B8B26B.4090104@aimvalley.nl \
--to=nvbolhuis@aimvalley.nl \
--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