Rebase linaro-swg/kernel to v6.18