Stephen Rothwell wrote:

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
kernel/stop_machine.c between commit
65c011845316d3c1381f478ca0d8265c43b3b039 ("cpumask: Replace
cpumask_of_cpu with cpumask_of_cpu_ptr") from the cpus4096 tree and
commit 775664f6fd1530f5c90a7e55984459fd8cbb74a5 ("stop_machine:simplify")
(and some later commits) from the rr tree.

The update done in the former seems not to be needed any more, so I used
the version of this file from the rr tree.  Someone should check.

Yes, it looks like you are correct.  The older code from cpus4096 is not
needed for kernel/stop_machine.c.  I'll look through the other changes and
send a note if there's any other issues.

Thanks!
Mike