# linux-next: manual merge of the net-next tree with the net tree

- From: Stephen Rothwell \<hidden\>
- Date: 2015-07-31 00:35:57 
- List: netdev
- Page: https://ratatoskr.run/netdev/2015/07/4547207

```text
Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/ethernet/ti/netcp_ethss.c

between commit:

  31a184b7acbc ("net: netcp: ethss: cleanup gbe_probe() and gbe_remove() functions")

from the net tree and commit:

  489e8a2f09d7 ("net: netcp: Fixes to CPSW statistics collection")

from the net-next tree.

I fixed it up (using the error path from the former) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
```