please pull infiniband.git for-linus
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get one bug fix for a problem that completely kills the mlx4 driver:
Roland Dreier (1):
mlx4_core: Fix infinite loop on device initialization
drivers/net/mlx4/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/mlx4/main.c +1 -1
@@ -884,7 +884,7 @@ static int __devinit mlx4_init_one(struct pci_dev *pdev, ++mlx4_version_printed; } -return mlx4_init_one (pdev, id); +return __mlx4_init_one (pdev, id); }static void mlx4_remove_one (struct pci_dev *pdev)