From: Stephen Rothwell <s...@canb.auug.org.au> Date: Fri, 9 Mar 2012 13:36:46 +1100
> Today's linux-next merge of the net-next tree got a conflict in > drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 > ("net: powerpc: remove the legacy iSeries ethernet driver") from the > powerpc tree and commit 41de8d4cff21 ("drivers/net: Remove alloc_etherdev > error messages") from the net-next tree. > > I just removed the file. If it makes life easier for anyone I can put the driver removal patch into net-next. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev