On Mon, 02 Mar 2020, Thomas Zimmermann <tzimmermann at suse.de> wrote: > I get a conflict when merging drm-next into drm-tip as part of 'dim > push-branch'. It's mine, doing drm-intel-fixes, I'll take care of it. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center