Merge branch 'next'

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/mach-imx/imx9/scmi/soc.c
Simple merge

diff --cc arch/arm/mach-mediatek/Kconfig
Simple merge

diff --cc configs/qcom_defconfig
Simple merge

diff --cc drivers/mmc/Kconfig
Simple merge

diff --cc dts/Kconfig
Simple merge