Tom and Simon, After commit 371244cb19f9804711dd66e4281ff7979915fd2e, all merges with new macros defined will have the compiling error. How shall we fix it? Some macros can be added to Kconfig. But some are for local use, better than magic numbers. Adding them to the white-list doesn't sound right. What's your suggestion? York