Remy,
On Wed, Jun 4, 2008 at 12:06 PM, Ben Warren biggerbadderben@gmail.com wrote:
Remy Bohmer wrote:
Hello Ben,
I can't get this to apply. Please re-base after applying your 6-patch set and the one that changes the order of rx status processing (or against the current net tree would be even better).
I just pulled the net repo and I see the problem: You forgot to apply patch number 5 of my series of 6... The one that modifies the eth_rx routine. (The patch of which it was all about ;-))
Chalk it up to git ineptitude on my part. If you look here:
http://git.denx.de/?p=u-boot/u-boot-net.git;a=summary
You'll see that Patch #5 is in the changelog, but if you look at the commitdiff you'll see that I really just added a new file called ".dotest/patch" when I fixed the whitespace issue manually. D'oh!
The net repo is now correct, I believe, but this patch still doesn't apply. I think it's because I had to manually edit patch #5, and this patch is touching the same code. Please rebase and resubmit.
regards, Ben