Merge branch 'hns-roce' into k.o/for-4.9