Merge branch 'master' into mm-stable

diff --cc MAINTAINERS
Simple merge

diff --cc arch/loongarch/kernel/setup.c
Simple merge

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc arch/riscv/include/asm/pgtable-64.h
Simple merge

diff --cc arch/riscv/include/asm/pgtable.h
Simple merge

diff --cc arch/riscv/kernel/Makefile
Simple merge

diff --cc arch/x86/kvm/mmu/mmu.c
Simple merge

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc arch/x86/mm/pat/set_memory.c
Simple merge

diff --cc include/linux/gfp.h
Simple merge

diff --cc mm/compaction.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/userfaultfd.c
Simple merge

diff --cc mm/vmscan.c
Simple merge