Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/x86/kernel/cpu/cpufreq/powernow-k8.c between commit
8ad2aedc2129f4e791dc7e2e89eabdcb2145d16c ("[CPUFREQ] checkpatch cleanups
for powernow-k8") from the cpufreq tree and commit
d58128cd5c204e6f9d2e1910f160064c15b5f19d
("cpumask:partial-revert-powernow-k8") from the rr tree.
Just simple overlapping changes. I fixed it up (used the conflicting
part from the rr tree change) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp6ckEk5D24l.pgp
Description: PGP signature
