Re: linux-next: merge conflict between drm-misc and sound trees