On Wednesday 11 February 2009 17:05:18 Wolfgang Denk wrote:
Dear Mike Frysinger,
In message 1233885882-18948-1-git-send-email-vapier@gentoo.org you wrote:
Signed-off-by: Mike Frysinger vapier@gentoo.org
drivers/serial/Makefile | 4 ++-- drivers/serial/ns16550.c | 5 ----- drivers/serial/serial.c | 4 ---- 3 files changed, 2 insertions(+), 11 deletions(-)
Fails:
Applying: drivers/serial/ns16550: move ifdef into Makefile COBJS-$(...) error: patch failed: drivers/serial/Makefile:28 error: drivers/serial/Makefile: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merged drivers/serial/Makefile CONFLICT (content): Merge conflict in drivers/serial/Makefile Failed to merge in the changes. Patch failed at 0001.
Please rebase and resubmit. Thanks.
your last commit (861a0000) messed up the drivers/serial/Makefile ... you committed the conflict info ... -mike