Dear monstr@seznam.cz,
In message 1216057545-18698-9-git-send-email-monstr@seznam.cz you wrote:
From: Michal Simek monstr@monstr.eu
Signed-off-by: Michal Simek monstr@monstr.eu
drivers/pci/Makefile | 10 ++++------ drivers/pci/fsl_pci_init.c | 4 ---- drivers/pci/pci.c | 4 ---- drivers/pci/pci_auto.c | 5 ----- drivers/pci/pci_indirect.c | 2 -- drivers/pci/tsi108_pci.c | 4 ---- drivers/pci/w83c553f.c | 4 ---- 7 files changed, 4 insertions(+), 29 deletions(-)
Applying pci: Clean drivers/pci/Makefile error: patch failed: drivers/pci/Makefile:25 error: drivers/pci/Makefile: patch does not apply error: patch failed: drivers/pci/fsl_pci_init.c:18 error: drivers/pci/fsl_pci_init.c: patch does not apply error: patch failed: drivers/pci/pci.c:30 error: drivers/pci/pci.c: patch does not apply error: patch failed: drivers/pci/pci_auto.c:14 error: drivers/pci/pci_auto.c: patch does not apply error: patch failed: drivers/pci/pci_indirect.c:11 error: drivers/pci/pci_indirect.c: patch does not apply error: patch failed: drivers/pci/tsi108_pci.c:27 error: drivers/pci/tsi108_pci.c: patch does not apply error: patch failed: drivers/pci/w83c553f.c:30 error: drivers/pci/w83c553f.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/pci/Makefile CONFLICT (content): Merge conflict in drivers/pci/Makefile Auto-merged drivers/pci/fsl_pci_init.c Auto-merged drivers/pci/pci_auto.c CONFLICT (content): Merge conflict in drivers/pci/pci_auto.c Failed to merge in the changes. Patch failed at 0009.
Please rebase and resubmit.
Best regards,
Wolfgang Denk