Hello, I just tried to merge linux-next (5c1af82119f11c5b322156b09d38cc37318849c4) into my private tree (based on 2b876f95d03e226394b5d360c86127cbefaf614b) and this happened: ... Removing sound/soc/au1x/sample-ac97.c Recorded preimage for 'arch/Kconfig' Recorded preimage for 'arch/arm/mach-s3c2440/mach-anubis.c' Recorded preimage for 'arch/arm/plat-mxc/Makefile' error: Could not parse conflict hunks in arch/arm/plat-s3c/dev-hsmmc2.c Recorded preimage for 'arch/arm/plat-s3c/include/plat/sdhci.h' Recorded preimage for 'arch/arm/plat-samsung/Kconfig' Recorded preimage for 'arch/x86/include/asm/x86_init.h' Recorded preimage for 'arch/x86/kernel/x86_init.c' Recorded preimage for 'drivers/net/wireless/ray_cs.c' Recorded preimage for 'kernel/Makefile' Recorded preimage for 'kernel/power/hibernate.c' Recorded preimage for 'net/sctp/sysctl.c' Automatic merge failed; fix conflicts and then commit the result. If you are interested, I can provide you the two trees above. When reproducing the line "error: ..." came later, but is still present. I guess this should be reproduceable with git clone -n git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git cd linux-2.6 git remote add -f next git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git git checkout 2b876f95d03e226394b5d360c86127cbefaf614b git merge 5c1af82119f11c5b322156b09d38cc37318849c4 I havn't tried though. The only non-trivial conflict is: #include <plat/sdhci.h> #include <plat/devs.h> <<<<<<< HEAD ======= <<<<<<< HEAD #include <plat/cpu.h> ======= >>>>>>> next-s5pc1xx >>>>>>> next/master Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html