big conflict in drm-tip (amdgpu)

[Daniel Vetter]

On Thu, Feb 28, 2019 at 5:30 AM Dave Airlie <airlied at gmail.com> wrote:
>
> I merged some fixes into drm-fixes, pushed it out, then saw tip
> breaking, but I'm needed elsewhere, so if anyone can fix tip up or
> tell me why I got a super messy commit, I'll owe you.

Chris already patched it up it seems, I guess someone should
double-check it's reasonable. For the future might be good if amd
trees push into drm-tip and/or linux-next beforehand, for early
warning and testing of the merge resolution. Ideally both I'd say.
It's the biggest driver we have after all :-)
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch