Hi Rusty, Today's linux-next merge of the rr tree added conflicts in arch/blackfin/kernel/ipipe.c and arch/x86/mach-voyager/setup.c. I didn't bother to work out exactly what is conflicting because I dropped the rr tree due to the build failures that I assume are still present from yesterday. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgp6yWbnK6Dqk.pgp
Description: PGP signature
