Re: arch merge fallout.

[Dave Jones]

[fixed up Cc list that I dorked previously]

On Thu, Oct 11, 2007 at 09:06:42PM -0700, Linus Torvalds wrote> 

 > On Thu, 11 Oct 2007, Dave Jones wrote:
 > >
 > > I had hoped that git would be smart(tm) enough to figure out
 > > that files had moved, and my changes in cpufreq.git would
 > > somehow 're-route' to the right files, but it seems that
 > > git isn't psychic, and gives up.
 > 
 > Actually, git *is* psychic, and can almost certainly do it, but you need 
 > to help it a bit.
 > 
 > Do a
 > 
 > 	git config --global diff.renamelimit 0
 > 
 > to tell git to not give up on just the sheer amount of renames.
 > 
 > (The default git rename detection limit is really designed for 
 > smaller-memory machines)

This still gives me the same problem.

(14:21:29:davej@hera:src)$ git clone -l linus test
Initialized empty Git repository in /home/davej/src/test/.git/
0 blocks
Checking 23014 files out...
 100% (23014/23014) done
(14:21:51:davej@hera:src)$ cd test/
(14:21:54:davej@hera:test)$ git config --global diff.renamelimit 0
(14:21:58:davej@hera:test)$ git pull ../cpufreqremote: Generating pack...
remote: Done counting 174 objects.
remote: Result has 116 objects.
remote: Deltifying 116 objects...
remote:  100% (116/116) done
remote: Total 116 (delta 105), reused 0 (delta 0)
Indexing 116 objects...
 100% (116/116) done
Resolving 105 deltas...
 100% (105/105) done
58 objects were added to complete this thin pack.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/e_powersaver.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/e_powersaver.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/elanfreq.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/elanfreq.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/gx-suspmod.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/gx-suspmod.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/longhaul.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/longhaul.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/p4-clockmod.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/p4-clockmod.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/powernow-k6.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/powernow-k6.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/powernow-k7.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/powernow-k7.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/powernow-k8.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/powernow-k8.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/sc520_freq.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/sc520_freq.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/speedstep-ich.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/speedstep-ich.c left in tree.
CONFLICT (delete/modify): arch/i386/kernel/cpu/cpufreq/speedstep-smi.c deleted in HEAD and modified in 9eb59573d4b86f347e6cd04f47a4c2082009fa58. Version 9eb59573d4b86f347e6cd04f47a4c2082009fa58 of arch/i386/kernel/cpu/cpufreq/speedstep-smi.c left in tree.
Auto-merged arch/powerpc/platforms/cell/cbe_cpufreq.c
Automatic merge failed; fix conflicts and then commit the result.

The git on master.kernel.org (1.5.3.4) is pretty recent, so I don't think
that's the problem, is it?

	Dave

-- 
http://www.codemonkey.org.uk
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/