Re: linux-next: manual merge of the net-next tree with the powerpc tree
flat view
From: David Miller <davem@davemloft.net>
Date: 2012-03-09 06:19:53
Also in:
linux-next, linuxppc-dev, lkml
From: Stephen Rothwell <redacted> 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.