Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/powerpc/kernel/sysfs.c between commit
9a3719341a9b5d2f5a2e590497346b61cf3462a5 ("powerpc: Make sysfs code use
smp_call_function_single") from the powerpc tree and commits
a604eba6e6850d9d225cc5e983c29be78e629580
("cpumask:remove-cpumask-games-arch-powerpc-kernel-sysfs.c") and
40d45a4bf32db8c75f837caa72bf4bb2c1040597
("cpumask:smp_call_function-in-powerpc-sysfs") from the rr tree.
The former appears to be an earlier version of the latter two. I fixed
it up (using the rr tree version) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpZKiyuRtxZN.pgp
Description: PGP signature
