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 c67ddf59ac44adc60649730bf8347e37c516b001 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024061952-placard-ninja-d1c5@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: c67ddf59ac44 ("riscv: force PAGE_SIZE linear mapping if debug_pagealloc is enabled") 629db01c64ff ("riscv: Don't use PGD entries for the linear mapping") 49a0a3731596 ("riscv: Check the virtual alignment before choosing a map size") 25abe0db9243 ("riscv: Fix kfence now that the linear mapping can be backed by PUD/P4D/PGD") 310c33dc7a12 ("Merge patch series "Introduce 64b relocatable kernel"") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
