[U-Boot-Users] [PATCH V2] Fix Ethernet init() return codes.

[Ben Warren]

Wolfgang Denk wrote:
> Dear Ben,
>
> in message <47853EA0.80008 at gmail.com> you wrote:
>   
>>> Which one? The original "[PATCH V2] Fix Ethernet init() return codes"
>>> patch?
>>>       
> ...
>   
>> Yes, the original V2 patch, not the one before it since it missed QE.
>>     
>
> Can you please rebase it? It fails now:
>
> error: patch failed: cpu/mpc8xx/fec.c:588
> error: cpu/mpc8xx/fec.c: patch does not apply
> error: patch failed: drivers/net/rtl8169.c:620
> error: drivers/net/rtl8169.c: patch does not apply
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Auto-merged cpu/mpc8xx/fec.c
> CONFLICT (content): Merge conflict in cpu/mpc8xx/fec.c
> Auto-merged drivers/net/rtl8169.c
> CONFLICT (content): Merge conflict in drivers/net/rtl8169.c
> Auto-merged drivers/net/tsec.c
> Auto-merged drivers/qe/uec.c
> Auto-merged net/eth.c
> Failed to merge in the changes.
> Patch failed at 0001.
>
> Sorry...
>
> Best regards,
>
> Wolfgang Denk
>
>   
Will do