linux-kernel - Re: arch merge fallout.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LFD.0.999.0710121542030.6887@woody.linux-foundation.org>
Date:	Fri, 12 Oct 2007 15:43:46 -0700 (PDT)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Dave Jones <davej@...hat.com>
cc:	Thomas Gleixner <tglx@...utronix.de>,
	Linux Kernel <linux-kernel@...r.kernel.org>
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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/