Re: [PATCH] drm/qxl: Fix build errors

On Tue, 18 Aug 2020 at 15:32, Gerd Hoffmann kraxel@redhat.com wrote:

Hi,

...

I guess things are never quite so easy :-). It looks like Daniel's patch is in drm-misc-fixes and Sidong's patch is in drm-misc-next. On their own they're fine, but once they are merged in drm-tip the build error shows up.

Ah, ok. I've already wondered how that got past my build testing. This explains it.

thanks for looking into it,

I've fixed this in drm-tip with a fixup.

In future when we find these silent conflicts, can someone please https://drm.pages.freedesktop.org/maintainer-tools/drm-tip.html

follow those instructions to fix it up.

Dave.