From: Mike Rapoport <mike@compulab.co.il>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] [PATCH] Add ability to take MAC address from the environment to DM9000 driver
Date: Tue, 07 Aug 2007 18:29:33 +0300 [thread overview]
Message-ID: <46B88FDD.4090708@compulab.co.il> (raw)
In-Reply-To: <20070807145611.764013535CD@atlas.denx.de>
Wolfgang Denk wrote:
> In message <46B84A47.3030908@compulab.co.il> you wrote:
>> Signed-off-by: Mike Rapoport <mike@compulab.co.il>
>
> Patch does not apply to current u-boot (neither -testing nor
> mainline). Please fix and resubmit:
>
> error: patch failed: drivers/dm9000x.c:302
> error: drivers/dm9000x.c: patch does not apply
> error: patch failed: include/net.h:435
> error: include/net.h: patch does not apply
> Using index info to reconstruct a base tree...
> error: patch failed: drivers/dm9000x.c:302
> error: drivers/dm9000x.c: patch does not apply
> error: patch failed: include/net.h:435
> error: include/net.h: patch does not apply
> Did you hand edit your patch?
> It does not apply to blobs recorded in its index.
> Cannot fall back to three-way merge.
> Patch failed at 0001.
I've just cloned the mainline HEAD, and created the patch from there.
This time the patch attached to avoid Thunderbird intervention.
> Best regards,
>
> Wolfgang Denk
>
--
Sincerely yours,
Mike.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dm9000.patch
Type: text/x-patch
Size: 2425 bytes
Desc: not available
Url : http://lists.denx.de/pipermail/u-boot/attachments/20070807/ab6da7e9/attachment.bin
next prev parent reply other threads:[~2007-08-07 15:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-07 10:32 [U-Boot-Users] [PATCH] Add ability to take MAC address from the environment to DM9000 driver Mike Rapoport
2007-08-07 14:56 ` Wolfgang Denk
2007-08-07 15:29 ` Mike Rapoport [this message]
2007-08-09 21:04 ` Wolfgang Denk
2007-08-09 21:10 ` Wolfgang Denk
2007-08-12 5:48 ` Mike Rapoport
2007-08-13 14:32 ` Ben Warren
2007-08-07 14:57 ` Wolfgang Denk
2007-08-07 16:07 ` Ben Warren
2007-08-08 5:35 ` Mike Rapoport
2007-08-08 6:48 ` Wolfgang Denk
2007-08-08 7:10 ` Mike Rapoport
2007-08-08 15:41 ` Ben Warren
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=46B88FDD.4090708@compulab.co.il \
--to=mike@compulab.co.il \
--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