pr-10394-9270cc vs. 5.0-15936 / sw-lin-mesa / chibi-robo-zfighting

pr-10394-9270cc (9270cc35) Diff 5.0-15936 (b237c747)
6279be96effb641378715c8c9814794ee225283b Waiting for diff... 7730beb243157a71a4d570e7bee541c1af20c085
d77dd0d801950d2cb1ef5523ee9b72e46ad6417e Waiting for diff... 39aa982937e2c5a98699ba207ea627299d955cc2
e55fb9d5f9b733844f16802e9ef4d1e71d9e0513 Waiting for diff... 9b46b0f17cc7f37d5d1ba3fc05028d194bab2a83