Messages in this thread | | | Date | Wed, 29 Jul 2009 16:52:11 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the net tree |
| |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in drivers/staging/epl/VirtualEthernetLinux.c between commit 6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions") from the net tree and commit 49acb975a21d150c4beba4e581f3e1d004dd2867 ("Staging: remove epl driver") from the staging tree.
The latter just removes the file, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |