On Fri, 9 Jul 2010 15:01:17 +1000 Stephen Rothwell wrote: > Hi all, > > Changes since 20100708: > > The infiniband tree gained a build failure so I used the version from > next-20100708. > > The wireless tree gained a conflict against the net tree. > > The block tree gained a build failure for which I applied a patch. > > The tty tree gained a conflict against the genesis tree. When both batman-adv and dt3155 are enabled as builtin (=y): drivers/staging/dt3155/built-in.o: In function `cleanup_module': (.text+0xc0): multiple definition of `cleanup_module' drivers/staging/batman-adv/built-in.o:(.text+0x330): first defined here drivers/staging/dt3155/built-in.o: In function `init_module': (.text+0x1120): multiple definition of `init_module' drivers/staging/batman-adv/built-in.o:(.text+0x400): first defined here --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- 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
