Hi Rusty, Today's linux-next merge of the rr tree got quite a few conflicts - too many for me to fix up right now. I shall drop it for today and try again tomorrow. One thing: You need to sort out where patches belong as at least one change that conflicted was because different versions of the same fix was applied to the rr and cpus4096 trees. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/ P.S. looking at commit dba205acec6f7db0b53abdf5b26802c19c0d9abf ("cpumask: fixlets") from the cpus4096 tree, "Signed-of-by: has two 'f's :-)
Attachment:
pgp9NCR65lMWC.pgp
Description: PGP signature
