Dear monstr@seznam.cz,
In message 1216057545-18698-10-git-send-email-monstr@seznam.cz you wrote:
From: Michal Simek monstr@monstr.eu
Signed-off-by: Michal Simek monstr@monstr.eu
drivers/input/Makefile | 7 ++++--- drivers/input/i8042.c | 4 ---- drivers/input/keyboard.c | 4 ---- drivers/input/pc_keyb.c | 4 ---- 4 files changed, 4 insertions(+), 15 deletions(-)
Applying input: Clean drivers/input/Makefile error: patch failed: drivers/input/Makefile:25 error: drivers/input/Makefile: patch does not apply error: patch failed: drivers/input/i8042.c:27 error: drivers/input/i8042.c: patch does not apply error: patch failed: drivers/input/keyboard.c:11 error: drivers/input/keyboard.c: patch does not apply error: patch failed: drivers/input/pc_keyb.c:13 error: drivers/input/pc_keyb.c: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merged drivers/input/Makefile CONFLICT (content): Merge conflict in drivers/input/Makefile Auto-merged drivers/input/pc_keyb.c Failed to merge in the changes. Patch failed at 0010.
Please rebase and resubmit.
Best regards,
Wolfgang Denk