5.0-12228 vs. 5.0-12226 / ogl-lin-mesa / chibi-robo-zfighting

5.0-12228 (2e8d1dd1) Diff 5.0-12226 (b36ab836)
ac58b74d6a355e9200c96d4f22a4f822c508b2ac Waiting for diff... f6942a2c9d25b9be0782294660c1c41322cbec31
f6942a2c9d25b9be0782294660c1c41322cbec31 Waiting for diff... 67cb3159a2245b16f6aa05804986090f7deeeb1a
f6942a2c9d25b9be0782294660c1c41322cbec31 Waiting for diff... 67cb3159a2245b16f6aa05804986090f7deeeb1a
67cb3159a2245b16f6aa05804986090f7deeeb1a Failure