Hi all,
Today's linux-next merge of the cpus4096 tree got a conflict in
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c between commit
4a922a969cb0190ce4580d4b064e2ac35f3ac9bf ("x86, cpufreq: remove leftover
copymask_copy()") from the x86 tree and commit
5cd7376200be7b8bab085557ff5876b04bd84191 ("fix: crash: IP:
__bitmap_intersects+0x48/0x73") from the cpus4096 tree.
They both remove the same line in get_cur_val, but the latter adds
another line. I have used the new line from the latter.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpGI2SBtEqnj.pgp
Description: PGP signature
