Hi Rusty, Today's linux-next merge of the rr tree got conflicts in the same files as the rr_cpumask tree plus a few more. Coming on top of the rr_cpumask conflicts, it was a bit much for today, so I have dropped the rr tree. Please see if you can sort it out a bit for tomorrow. Or at least give me a hint as to how to fix the conflicts. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpwTIjoPqV42.pgp
Description: PGP signature
