Dear monstr@seznam.cz,
In message 1216057545-18698-5-git-send-email-monstr@seznam.cz you wrote:
From: Michal Simek monstr@monstr.eu
Signed-off-by: Michal Simek monstr@monstr.eu
drivers/mtd/Makefile | 6 +++--- drivers/mtd/at45.c | 2 -- drivers/mtd/cfi_flash.c | 3 --- drivers/mtd/mw_eeprom.c | 5 ----- 4 files changed, 3 insertions(+), 13 deletions(-)
error: patch failed: drivers/mtd/Makefile:25 error: drivers/mtd/Makefile: patch does not apply error: patch failed: drivers/mtd/at45.c:21 error: drivers/mtd/at45.c: patch does not apply error: patch failed: drivers/mtd/cfi_flash.c:39 error: drivers/mtd/cfi_flash.c: patch does not apply error: patch failed: drivers/mtd/mw_eeprom.c:1 error: drivers/mtd/mw_eeprom.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/mtd/Makefile CONFLICT (content): Merge conflict in drivers/mtd/Makefile Auto-merged drivers/mtd/at45.c CONFLICT (content): Merge conflict in drivers/mtd/at45.c Auto-merged drivers/mtd/cfi_flash.c Failed to merge in the changes. Patch failed at 0005.
Please rebase and resubmit.
Best regards,
Wolfgang Denk