Re: [PATCH] drm/ttm: fix broken merge between drm-next and drm-misc-next