Dear Ben Warren,
In message 4A1B8F6F.4030905@gmail.com you wrote:
Wolfgang Denk wrote:
Use existing struct fec512x instead.
Signed-off-by: Wolfgang Denk wd@denx.de Cc: John Rigby jcrigby@gmail.com
drivers/net/mpc512x_fec.c | 13 +++-- drivers/net/mpc512x_fec.h | 128 +-------------------------------------------- 2 files changed, 10 insertions(+), 131 deletions(-)
I can't apply this patch:
Applying MPC512x FEC: get rid of duplicated struct ethernet_regs fatal: patch fragment without header at line 206: @@ -180,7 +56,7 @@ typedef struct { Patch failed at 0001. When you have resolved this problem run "git-am --resolved". If you would prefer to skip this patch, instead run "git-am --skip".
Any idea what's going on?
The whole patch series applies to the "next" branch. I just verified that it still applies cleanly (git-am) against gurrent next.
Error message above makes me think your file might have been corrupted?
If you agree with the patch, then just ACK it, and I pull everything into the 5xxx repo.
Best regards,
Wolfgang Denk