Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
kernel/rcuclassic.c between commit
6a7b3dc3440f7b5a9b67594af01ed562cdeb41e4 ("sched: convert nohz_cpu_mask
to cpumask_var_t") from the cpus4096 tree and commit
fe9482e26320b110e102afa01f84c3302d0b1593 ("cpumask: convert RCU
implementations") from the rr tree.

I fixed it up (used the rr tree version) and can carry the fix as
necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/