Merge branch 'v5.10/standard/base' into v5.10/standard/nxp-sdk-5.10/nxp-soc

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

# Conflicts:
#	drivers/mmc/host/sdhci-esdhc-imx.c
#	drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
#	drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c