[U-Boot] [PATCH 1/3] Changed PPC4xx EMAC driver to require CONFIG_PPC4xx_EMAC

[Ben Warren]

Hi Stefan,

Stefan Roese wrote:
> Hi Ben,
>
> On Thursday 30 October 2008, Ben Warren wrote:
>   
>> All in-tree IBM/AMCC PPC4xx boards using the EMAC get this new CONFIG
>>     
>
> Looks good, thanks for all this work.
>
> Unfortunately it doesn't apply to my current u-boot-ppc4xx/master branch:
>
> [stefan at kubuntu u-boot-ppc4xx (master)]$ git am -3 -s patches_ben/\[PATCH\ 
> 1_3\]\ Changed\ PPC4xx\ EMAC\ driver\ to\ require\ CONFIG_PPC4xx_EMAC.mbox
> Applying: Changed PPC4xx EMAC driver to require CONFIG_PPC4xx_EMAC
> error: patch failed: net/eth.c:153
> error: net/eth.c: patch does not apply
> fatal: sha1 information is lacking or useless (net/eth.c).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001.
> When you have resolved this problem run "git am -3 --resolved".
> If you would prefer to skip this patch, instead run "git am -3 --skip".
> To restore the original branch and stop patching run "git am -3 --abort".
>
>   
Yeah, I probably should have grouped all the net/eth.c patches 
together.  If you install the other ones sent at the same time I expect 
it will apply.  I'll re-base this one for you so you can test it.
> Could you please rebase it for me?
>
> And how should we handle these patches? Should they go in via my repository?
>
>   
I was hoping you'd ACK them and I'd apply to -net, since it's but one of 
many controllers I'm messing with.
> Best regards,
> Stefan
>
> =====================================================================
> DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
> =====================================================================
>