pr-8730-bcbe8d vs. 5.0-11827 / ogl-lin-mesa / chibi-robo-zfighting

pr-8730-bcbe8d (bcbe8d5c) Diff 5.0-11827 (4ff85592)
f6942a2c9d25b9be0782294660c1c41322cbec31 Waiting for diff... ac58b74d6a355e9200c96d4f22a4f822c508b2ac
67cb3159a2245b16f6aa05804986090f7deeeb1a Waiting for diff... f6942a2c9d25b9be0782294660c1c41322cbec31
67cb3159a2245b16f6aa05804986090f7deeeb1a Waiting for diff... f6942a2c9d25b9be0782294660c1c41322cbec31
Failure 67cb3159a2245b16f6aa05804986090f7deeeb1a