On Thu, 22 Sep 2011, Stephen Rothwell wrote: > Hi Arnd, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-nuc93x/Makefile.boot between commit 86783a0c544d ("ARM: > 7022/1: allow to detect conflicting zreladdrs") from the arm tree and > commit 6adc1e7ff19d ("ARM: mach-nuc93x: delete") from the arm-soc tree. > > The latter removes the file that the former updates, so i did that. That is correct. Nicolas -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html