Merge tag 'hisi-maintainer-fix' of https://github.com/hisilicon/linux-hisi into arm...