Merge branches 'hfi1' and 'mlx' into k.o/for-4.9-rc