On Wed, Dec 10, 2014 at 19:54:05 +1100, Stephen Rothwell wrote: > Hi all, > > After merging the net-next tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > drivers/net/ethernet/chelsio/cxgb4vf/built-in.o:(.opd+0x630): multiple definition of `t4_bar2_sge_qregs' > drivers/net/ethernet/chelsio/cxgb4/built-in.o:(.opd+0x14d0): first defined here > drivers/net/ethernet/chelsio/cxgb4vf/built-in.o: In function `.t4_bar2_sge_qregs': > (.text+0x9220): multiple definition of `.t4_bar2_sge_qregs' > drivers/net/ethernet/chelsio/cxgb4/built-in.o:(.text+0x24e24): first defined here > > Caused by commit e85c9a7abfa4 ("cxgb4/cxgb4vf: Add code to calculate T5 > BAR2 Offsets for SGE Queue Registers") which added both versions. :-( > > I have applied this fir patch for today (including the subject > typo :-)): > My bad. Thanks for the fix. -- 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