Merge tag 'hisi-fixes-for-4.14' of git://github.com/hisilicon/linux-hisi into next...