Messages in this thread | | | Date | Fri, 12 Oct 2007 15:43:46 -0700 (PDT) | From | Linus Torvalds <> | Subject | Re: arch merge fallout. |
| |
On Fri, 12 Oct 2007, Dave Jones wrote: > > pull req below. If it turns out to be more trouble than its worth,
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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |