$ 0 0 Hi Catalin, Today's linux-next merge of the arm64 tree got a conflict in: arch/arm64/include/asm/cputype.h between commit: 9eb8a2cdf65c ("arm6