$ 0 0 Hi Daniel, Today's linux-next merge of the clockevents tree got a conflict in: drivers/clocksource/Kconfig between commit: 863ee050726b ("cloc