Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files
  mlx4_core: Add VLAN tag field to WQE control segment struct
  RDMA/nes: CM connection setup/teardown rework
  IPoIB: Correct help text for INFINIBAND_IPOIB_DEBUG
  IPoIB/cm: Connected mode is no longer EXPERIMENTAL
  RDMA/ucm: BKL is not needed for ib_ucm_open()
  RDMA/ucma: BKL is not needed for ucma_open()

diff --combined drivers/net/mlx4/eq.c
index 7df928d3a3d82a55db3f970cf20257e6168161ec,bd34bf08830d50667d9bdc659e3b0971788c2f05..8a8b56135a58bda015fac0a4b184b4e344072072
--- 1/drivers/net/mlx4/eq.c
--- 2/drivers/net/mlx4/eq.c
+++ b/drivers/net/mlx4/eq.c
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
+  * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved.
   * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc. All rights reserved.
   *
   * This software is available to you under a choice of one of two
@@@ -526,7 -526,7 +526,7 @@@ int mlx4_map_eq_icm(struct mlx4_dev *de
                return -ENOMEM;
        priv->eq_table.icm_dma  = pci_map_page(dev->pdev, priv->eq_table.icm_page, 0,
                                               PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
 -      if (pci_dma_mapping_error(priv->eq_table.icm_dma)) {
 +      if (pci_dma_mapping_error(dev->pdev, priv->eq_table.icm_dma)) {
                __free_page(priv->eq_table.icm_page);
                return -ENOMEM;
        }