pr-13111-ddf620 vs. 2409-115 / vk-lin-mesa / chibi-robo-zfighting

pr-13111-ddf620 (ddf62005) Diff 2409-115 (7db13d23)
f90dee503640623d154b83906870cbb290cd6bab Waiting for diff... 9376da6012fccb6cee8b6ab4e485ae9ad0d1a3b6
adf1c5beb0131f445b910accf600877d97de6712 Waiting for diff... 2d3e5ed6af98a2e821383bdbb41ec8b9e280afd5
1f3ee687fac943fdd6832138dc4d7766834e153a Waiting for diff... 30b9cf18171dd28faaf7a73a39b570ef348c2cfb