conflicts in amdkfd between -next and -fixes

conflicts in amdkfd between -next and -fixes

[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.

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

Re: conflicts in amdkfd between -next and -fixes

[Oded Gabbay]

[-- Attachment #1.1: Type: text/plain, Size: 502 bytes --]

Sure, no problem. I'll update you.
Oded
On Jan 29, 2015 3:49 AM, "Dave Airlie" <airlied@gmail.com> 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.
>

[-- Attachment #1.2: Type: text/html, Size: 800 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

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

Re: conflicts in amdkfd between -next and -fixes

[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 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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel