[U-Boot] [PATCH v3] net: axi_ethernet: Add driver to u-boot

[Wolfgang Denk]

Dear Michal Simek,

In message <1316094617-13657-1-git-send-email-monstr at monstr.eu> you wrote:
> Add axi_ethernet driver for little-endian Microblaze.
> 
> RX/TX BDs and rxframe buffer are shared among all axi_ethernet MACs.
> Only one MAC can work in one time.
> 
> Signed-off-by: Michal Simek <monstr at monstr.eu>
> 
> ---
> 
> v2: Fix cammelcase weirdness
>     Create mdio_wait function with timeouts
>     Synchronize debug messages
>     Remove base address + offset notation -> use struct instead
> 
> v3: Fix comments
>     Add timeouts/delays to waiting loops
>     Use in/out_be32 for dma accesses
>     Setup return values for phy functions
> ---
>  drivers/net/Makefile          |    1 +
>  drivers/net/xilinx_axi_emac.c |  664 +++++++++++++++++++++++++++++++++++++++++
>  include/netdev.h              |    2 +
>  3 files changed, 667 insertions(+), 0 deletions(-)
>  create mode 100644 drivers/net/xilinx_axi_emac.c

This fails to apply:

Applying: net: axi_ethernet: Add driver to u-boot
fatal: sha1 information is lacking or useless (include/netdev.h).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 net: axi_ethernet: Add driver to u-boot
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".


Please fix and resubmit.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If a group of N persons implements a COBOL compiler,  there  will  be
N-1 passes. Someone in the group has to be the manager. - T. Cheatham