Messages in this thread | | | Date | Thu, 29 Jan 2015 10:19:04 +0200 | From | Oded Gabbay <> | Subject | Re: linux-next: manual merge of the drm tree with Linus' tree |
| |
On 01/29/2015 04:17 AM, Stephen Rothwell wrote: > Hi Dave, > > Today's linux-next merge of the drm tree got conflicts in > drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c and > drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h between commits > b8cbab042cd6 ("drm/amdkfd: Allow user to limit only queues per device") > and 9fa843e76d90 ("drm/amdkfd: Fix bug in call to init_pipelines()") > from Linus' tree and commits bcea30817574 ("drm/amdkfd: Add SDMA > user-mode queues support to QCM") and fe502804205e ("drm/amdkfd: Remove > call to deprecated init_memory interface") from the drm tree. > > I fixed it up (hopefully - see below) and can carry the fix as > necessary (no action is required). > Looks fine, thanks!
Oded
| |