Merge branches 'misc-4.7-2', 'ipoib' and 'ib-router' into k.o/for-4.7