Merge branch 'hns3-promisc-next'