Hi Rusty,
Today's linux-next merge of the rr tree got a conflicts in
include/linux/cpumask.h and lib/cpumask.c between commit
2d3854a37e8b767a51aba38ed6d22817b0631e33 ("cpumask: introduce new API,
without changing anything") from the cpus4096 tree and commit
0c82f41da4f9a68874b584f23feca217ba4fcd62 ("cpumask:new-API-only") from
the rr tree.
These are just different versions of the same patch, so I used the rr tree
version.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpWNFxyyKTIt.pgp
Description: PGP signature
