Merge branch 'hisilicon-fixes'