pr-9956-537314 vs. 5.0-14802 / ogl-lin-mesa / chibi-robo-zfighting

pr-9956-537314 (5373148b) Diff 5.0-14802 (8a078ea4)
8145047b830faf264d99f621f4b1f139331c169b Waiting for diff... ac58b74d6a355e9200c96d4f22a4f822c508b2ac
ad036c95df5e01bb62a51c7acea72601f57c3f31 Waiting for diff... f6942a2c9d25b9be0782294660c1c41322cbec31
08d6d8cb4a312c616c9cc609e8e9a02d3f7b88a9 Waiting for diff... 67cb3159a2245b16f6aa05804986090f7deeeb1a