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/dma/mxs-dma.c
Loading
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
# Conflicts:
# drivers/dma/mxs-dma.c