Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 2 deletions

diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index d278432f080b..d24f6c142d03 100644
--- a/net/rds/tcp.c
+++ b/net/rds/tcp.c
@@ -651,7 +651,7 @@ static int rds_tcp_init(void)
 
         ret = rds_tcp_recv_init();
         if (ret)
-                goto out_slab;
+                goto out_pernet;
 
         ret = rds_trans_register(&rds_tcp_transport);
         if (ret)
@@ -663,8 +663,9 @@ static int rds_tcp_init(void)
 
 out_recv:
         rds_tcp_recv_exit();
-out_slab:
+out_pernet:
         unregister_pernet_subsys(&rds_tcp_net_ops);
+out_slab:
         kmem_cache_destroy(rds_tcp_conn_slab);
 out:
         return ret;