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