Hi all, 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. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp9qKxiAVQeH.pgp
Description: PGP signature