Merge tag 'sunxi-config-for-5.5-2' of https://git.kernel.org/pub/scm/linux/kernel...