Merge branches 'ehca' and 'mlx4' into for-linus