Merge branch 'hfi1' into k.o/for-4.14