Merge commit 'origin/HEAD' into test-merge

Manual fixup of include/asm-powerpc/pgtable-ppc64.h