[Mesa-dev] [ANNOUNCE] Mesa 17.3.7 release candidate

[Emil Velikov]

On 16 March 2018 at 12:07, Daniel Stone <daniel at fooishbar.org> wrote:
> Hi Juan,
>
> On 16 March 2018 at 11:42, Juan A. Suarez Romero <jasuarez at igalia.com> wrote:
>> Trivial merge conflicts
>> -----------------------
>>
>> [...]
>>
>> commit 5fd11359b66c8138d2c7ee29bd9740280b02d1e2
>> Author: Daniel Stone <daniels at collabora.com>
>>
>>     egl/wayland: Fix ARGB/XRGB transposition in config map
>>
>>     (cherry picked from commit 4fbd2d50b1c06a3c10f3a254e933646345123751)
>
> This commit isn't in the 17.3 branch; was it rebased into another commit?
>
Seems like the sha's are off, although commits and contents seem sane IMHO.
The corrected list is:

commit 6ddf838def69036a48524e2f5ae79fb01170e59c
Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

   radv: Always lower indirect derefs after nir_lower_global_vars_to_local.

   (cherry picked from commit 05d84ed68add9e6adfcc602a274405e04226c1b7)


commit 56a9c6541e96bb08f56c55c0a5047cbd14307d81
Author: Bas Nieuwenhuizen <basni at chromium.org>

   radeonsi: Export signalled sync file instead of -1.

   (cherry picked from commit 5a3404d443e0c6e8e9a44d7f8dccf96c5ac18f0f)

   Squashed with:

   configure/meson: Bump libdrm_amdgpu version requirement.

   (cherry picked from commit 52be440f48ac7c337f6604846bb6f0cfd88e7118)


commit 2e043c9bcf0182bb631a9ed0c4562775106cd1db
Author: Daniel Stone <daniels at collabora.com>

   egl/wayland: Fix ARGB/XRGB transposition in config map

   (cherry picked from commit 4fbd2d50b1c06a3c10f3a254e933646345123751)


commit 1288d1efa851f94ba3c2a591ca32febb6b447ada
Author: Dave Airlie <airlied at redhat.com>

   ac/nir: don't apply slice rounding on txf_ms

   (cherry picked from commit 69495b30a38fbb01a937cdea6f7674f89a2e60e7)


HTH
Emil