The cpumask changes (needed for 4096 CPU support) also touch the x86 tree - the recent x86.git pull i sent will cleanly merge with this tree, in either order. The only real complication the 4K CPU related changes have are in the scheduler code - that's why they were merged and tested in this tree. They have wider API impact than the scheduler but those are straightforward/trivial. It was all tested in linux-next as well.