Re: conflicts in amdkfd between -next and -fixes

On 01/29/2015 03:49 AM, Dave Airlie wrote:

Hey Oded,

so I pulled -fixes into -next this morning and made amdkfd build again, it had a few conflicts in it,

I've pushed a drm-next branch with the conflicts resolved and amdkfd that builds, the only one I'm a bit scared on was the size calculation fixup for the removal of the max processes.

can you please look at the drm-next and see if it breaks anything.

Dave. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel

Hi Dave, I looked at drm-next and your merge is perfect. thanks! However, I noticed two minor bugs so this pass on the code was even more beneficial :) I'll send fixes shortly.

Oded