Merge branch 'k.o/for-4.12' into k.o/for-4.12-rdma-netdevice