git.maquefel.me Git - linux.git/commit

author	Michael Ellerman <mpe@ellerman.id.au>
	Sat, 9 Jul 2022 09:29:34 +0000 (19:29 +1000)
committer	Michael Ellerman <mpe@ellerman.id.au>
	Sat, 9 Jul 2022 09:29:34 +0000 (19:29 +1000)
commit	7e74dabc3daf0c217cb5e8e849a8f6c02927950f
tree	8620e5d95e732952473eeb764aee17693e4458bd	tree \| snapshot
parent	54c15ec3b738c6086f2be001dae962ec412640e5	commit \| diff
parent	887502826549caa7e4215fd9e628f48f14c0825a	commit \| diff

Merge branch 'fixes' into next

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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/prom_init.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/mem.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/setup.c	diff1 \|	diff2 \|	blob \| history