http://bugzilla.kernel.org/show_bug.cgi?id=11541
------- Comment #56 from kli...@go2.pl 2009-01-21 01:21 ------- I'm trying to do this, but it's the first time I'm using GIT... I downloaded the lastest git tree to some directory and I'm launching: bash-3.1# git revert 2b1f6278d77c1f2f669346fc2bb48012b5e9495a warning: too many files, skipping inexact rename detection CONFLICT (delete/modify): arch/i386/kernel/cpu/mtrr/main.c deleted in HEAD and modified in 2b1f627... [PATCH] x86: Save the MTRRs of the BSP before booting an AP. Version 2b1f627... [PATCH] x86: Save the MTRRs of the BSP before booting an AP of arch/i386/kernel/cpu/mtrr/main.c left in tree. CONFLICT (delete/modify): arch/i386/kernel/smpboot.c deleted in HEAD and modified in 2b1f627... [PATCH] x86: Save the MTRRs of the BSP before booting an AP. Version 2b1f627... [PATCH] x86: Save the MTRRs of the BSP before booting an AP of arch/i386/kernel/smpboot.c left in tree. CONFLICT (delete/modify): arch/x86_64/kernel/smpboot.c deleted in HEAD and modified in 2b1f627... [PATCH] x86: Save the MTRRs of the BSP before booting an AP. Version 2b1f627... [PATCH] x86: Save the MTRRs of the BSP before booting an AP of arch/x86_64/kernel/smpboot.c left in tree. CONFLICT (delete/modify): include/asm-i386/mtrr.h deleted in HEAD and modified in 2b1f627... [PATCH] x86: Save the MTRRs of the BSP before booting an AP. Version 2b1f627... [PATCH] x86: Save the MTRRs of the BSP before booting an AP of include/asm-i386/mtrr.h left in tree. CONFLICT (delete/modify): include/asm-x86_64/mtrr.h deleted in HEAD and modified in 2b1f627... [PATCH] x86: Save the MTRRs of the BSP before booting an AP. Version 2b1f627... [PATCH] x86: Save the MTRRs of the BSP before booting an AP of include/asm-x86_64/mtrr.h left in tree. Automatic revert failed. After resolving the conflicts, mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result. There are some error, so I think it's not working. I can still search over internet for solution, but it will take some time. Could You help me doing this? Thanks in advance. Sorry for my lack of skills. PS. I consider, that some changes in files are causing this, but, as I mentioned before, I use GIT for a first time. -- Configure bugmail: http://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug, or are watching someone who is. ------------------------------------------------------------------------------ This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword _______________________________________________ acpi-bugzilla mailing list acpi-bugzilla@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/acpi-bugzilla
