$ 0 0 Hi all, Today's linux-next merge of the mvebu tree got a conflict in: arch/arm64/configs/defconfig between commit: efdda175c07f ("arm64: defco