lkml.org 
[lkml]   [2007]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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/

\
 
 \ /
  Last update: 2007-10-13 01:17    [W:2.573 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site