]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Sat, 9 Jul 2022 09:29:34 +0000 (19:29 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Sat, 9 Jul 2022 09:29:34 +0000 (19:29 +1000)
commit64318b02c64206014122dcb50692ed0b07831c79
tree8620e5d95e732952473eeb764aee17693e4458bd
parent395b6dc8b931279525a74046d2a49d96a2897d34
parentda5b427bc3f46400e4c723e10e83cda293dd983f
Merge branch 'fixes' into next

Merge our fixes branch. In particular this brings in commit
2f2e917c1ba1 ("powerpc/book3e: Fix PUD allocation size in
map_kernel_page()") which fixes a build failure in next, because commit
96bb43d3c142 ("powerpc/64e: Rewrite p4d_populate() as a static inline
function") depends on it.
arch/powerpc/Kconfig
arch/powerpc/kernel/prom_init.c
arch/powerpc/mm/mem.c
arch/powerpc/platforms/pseries/setup.c