conflicts in amdkfd between -next and -fixes

2015-01-29 Thread Dave Airlie
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.

conflicts in amdkfd between -next and -fixes

2015-01-29 Thread Oded Gabbay
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

conflicts in amdkfd between -next and -fixes

2015-01-29 Thread Oded Gabbay
Sure, no problem. I'll update you. Oded On Jan 29, 2015 3: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