Re: arch merge fallout.

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Dave Jones <davej@...>
Cc: Thomas Gleixner <tglx@...>, Linux Kernel <linux-kernel@...>
Date: Friday, October 12, 2007 - 6:43 pm

On Fri, 12 Oct 2007, Dave Jones wrote:

It merged totally automatically, no trouble what-so-ever:

	Renamed arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c => arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
	Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
	Renamed arch/i386/kernel/cpu/cpufreq/longhaul.c => arch/x86/kernel/cpu/cpufreq/longhaul.c
	Auto-merged arch/x86/kernel/cpu/cpufreq/longhaul.c
	Auto-merged arch/powerpc/platforms/cell/cbe_cpufreq.c
	Merge made by recursive.

I think it was just unlucky that the particular version of git you have 
probably hit exactly in the window of "limited rename detection" *and* 
lacking the config switch to turn off the limiter.

		Linus
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: arch merge fallout., Dave Jones, (Fri Oct 12, 2:25 pm)
Re: arch merge fallout., Linus Torvalds, (Fri Oct 12, 5:58 pm)
Re: arch merge fallout., Dave Jones, (Fri Oct 12, 6:12 pm)
Re: arch merge fallout., Linus Torvalds, (Fri Oct 12, 6:43 pm)
Re: arch merge fallout., Dave Jones, (Fri Oct 12, 6:52 pm)
Re: arch merge fallout., Linus Torvalds, (Fri Oct 12, 7:14 pm)
Re: arch merge fallout., Dave Jones, (Fri Oct 12, 8:11 pm)
Re: arch merge fallout., Linus Torvalds, (Fri Oct 12, 8:32 pm)
Re: arch merge fallout., Dave Jones, (Fri Oct 12, 8:25 pm)