On Tue, Jan 20, 2009 at 01:47:13PM +1100, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the cpufreq tree got a conflict in
> arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c between commit
> 5cd7376200be7b8bab085557ff5876b04bd84191 ("fix: crash: IP:
> __bitmap_intersects+0x48/0x73") from the cpus4096 tree and commit
> 6fc619dc092a0a159cf5fb46afa52f2f8128b1d4 ("[CPUFREQ] checkpatch cleanups
> for acpi-cpufreq") from the cpufreq tree.
>
> Just changing context. I fixed it up (see below) and can carry the fix
> as necessary.
Yep, looks sane.
I can't wait for this cpumask stuff to be over with, it's been a
pain in the ass for merge collisions.
Dave
--
http://www.codemonkey.org.uk
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
