Patch Set 18:
The conflict is happened in
src/soc/mediatek/mt8192/include/soc/addressmap.h

EMI_BASE is right after I2C_DMA_BASE.

In future, I'd say there are few ways to solve that:
 - Isolate that to a different change, or
 - Pick the same CL to both tot chain

View Change

To view, visit change 47800. To unsubscribe, or for help writing mail filters, visit settings.