Merge our fixes branch. In particular this brings in commit
98648161 ("powerpc/book3e: Fix PUD allocation size in
map_kernel_page()") which fixes a build failure in next, because commit
2db2008e ("powerpc/64e: Rewrite p4d_populate() as a static inline
function") depends on it.