Merge branches 'cma', 'cxgb4' and 'qib' into for-next