Merge branch 'net-hns3-updates-for-next'