[Mesa-stable] New stable-branch 10.4 candidate pushed

[Emil Velikov]

On 5 March 2015 at 01:57, Matt Turner <mattst88 at gmail.com> wrote:
> On Wed, Mar 4, 2015 at 4:53 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>> Trivial merge conflicts
>> -----------------------
>> Here are the commits where I manually merged conflicts, so these might
>> merit additional review:
>>
>> commit a598a9bdfe9f5d0ed35ca89a55cf74a2b678e8e1
>> Author: Matt Turner <mattst88 at gmail.com>
>>
>>     mesa: Correct backwards NULL check.
>>
>>     (cherry picked from commit 491d42135ad0e5670756216154f2ba9fc79d4ba7)
>
> Again looks like I tagged something for 10.4 that doesn't apply.
>
> This one needs to be reverted (we've changed it so that if length is
> NULL, dereference it!)
>
> If we want to apply fixes for GetProgramBinary, we need 201b9c18,
> 4fd8b301, and f591712e first.
>
> I'd revert this commit, cherry-pick those just mentioned and then
> cherry-pick 491d42135 on top of that.
>
I recall that the series was picked for 10.4, or perhaps I was meant
to pick it up. That explains the unusual conflict.

Thanks you Matt !

-Emil