Re: linux-next: manual merge of the drm tree with Linus' tree

Dave Airlie
2009-08-20T05:30:14Z

> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/radeon/radeon_ttm.c between commit
> ad49f501867cba87e1e45e5ebae0b12435d68bf1 ("drm/ttm/radeon: add dma32
> support") from Linus' tree and commit
> a987fcaa805fcb24ba885c2e29fd4fdb6816f08f ("ttm: Make parts of a struct
> ttm_bo_device global") from the drm tree.

I merged Linus tree soon after and pushed it out so it should be okay now.

Dave.