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