Merge branch 'imx8-5.0-devkit' into 'imx8-5.0-devkit'
# Conflicts: # arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts # arch/arm64/boot/dts/freescale/imx8mq.dtsi # arch/arm64/configs/librem5-devkit_defconfig # drivers/net/wireless/rsi/rsi_91x_mgmt.c