Merge branch 'k.o/for-4.10-rc' into HEAD

2017-02-19 09:18:21 -05:00
parent 6df6b4a9ce 646ebd4166
commit 6dd7abae71
30 changed files with 283 additions and 196 deletions
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -538,7 +538,7 @@ struct rxe_dev *rxe_net_add(struct net_device *ndev)
 	}

 	spin_lock_bh(&dev_list_lock);
-	list_add_tail(&rxe_dev_list, &rxe->list);
+	list_add_tail(&rxe->list, &rxe_dev_list);
 	spin_unlock_bh(&dev_list_lock);
 	return rxe;
 }