Today's linux-next merge of the tip tree got conflicts in arch/h8300/include/asm/KbuildI just removed the file.Thanks,Thierry