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

Dave Airlie
2015-01-22T02:31:20Z

> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/radeon/radeon_kfd.c between commit b64b8afcca9d
> ("drm/amd: Fixing typos in kfd<->kgd interface") from Linus' tree and
> commit a84a9903b588 ("drm/radeon: Implement SDMA interface functions")
> from the drm tree.

btw I pushed a drm-next with all these fixed in it a little while ago

we must be racing!
Dave.