Merge branches 'misc', 'mlx4' and 'nes' into for-next