The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 21a741eb75f80397e5f7d3739e24d7d75e619011 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024070820-relapse-humbly-3545@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 21a741eb75f8 ("powerpc/pseries: Fix scv instruction crash with kexec") 2ab2d5794f14 ("powerpc/kasan: Disable address sanitization in kexec paths") e6f6390ab7b9 ("powerpc: Add missing headers") 3ba4289a3e7f ("powerpc: Simplify and move arch_randomize_brk()") ce0091a0e060 ("powerpc/time: Fix sparse warnings") 387e220a2e5e ("powerpc/64s: Move hash MMU support code under CONFIG_PPC_64S_HASH_MMU") 20626177c9de ("powerpc: make memremap_compat_align 64s-only") ffbe5d21d10f ("powerpc/64: pcpu setup avoid reading mmu_linear_psize on 64e or radix") f43d2ffb47c9 ("powerpc/64s: Rename hash_hugetlbpage.c to hugetlbpage.c") 162b0889bba6 ("powerpc/64s: move THP trace point creation out of hash specific file") 3d3282fd34d8 ("powerpc/pseries: lparcfg don't include slb_size line in radix mode") 0c7cc15e9215 ("powerpc/pseries: move process table registration away from hash-specific code") 7ebc49031d04 ("powerpc: Rename PPC_NATIVE to PPC_HASH_MMU_NATIVE") 6e5772c8d9cf ("Merge tag 'x86_cc_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
