Merge branches 'cma', 'misc', 'mlx4' and 'nes' into for-linus