TTM/nouveau conflict in drm-misc-next

[Christian König]

Hey Thomas & Alex,

well the TTM and Nouveau changes look good to me, but this completely 
broke amdgpu.

Alex any idea what is going on here?

Regards,
Christian.

Am 12.08.20 um 21:10 schrieb Thomas Zimmermann:
> Hi Christian and Ben,
>
> I backmerged drm-next into drm-misc-next and had a conflict between ttm
> and nouveau. struct ttm_mem_res got renamed to struct ttm_resource. I
> updated nouveau to the new name, test-built, and pushed the result to
> drm-misc-next. If either of you has a minute, you may want to double
> check the merge.
>
> Best regards
> Thomas
>