Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/x86/kernel/cpu/cpufreq/speedstep-ich.c between commit
ed5a409578578f263a362d6527ad9e5a493e2a44 ("[CPUFREQ] cpumask: avoid
playing with cpus_allowed in speedstep-ich.c") from the cpufreq-current
tree and commit a5b99ac32f444cd1b7d9aa60ee468de15f8d6964
("cpumask:remove-cpumask-games-arch-x86-kernel-cpu-cpufreq-speedstep-ich.c")
from the rr tree.
Just white space differences ... I used the version from the
cpufreq-current tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpCXmxpvlY0H.pgp
Description: PGP signature
