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: (63 commits)
  IB/qib: clean up properly if pci_set_consistent_dma_mask() fails
  IB/qib: Allow driver to load if PCIe AER fails
  IB/qib: Fix uninitialized pointer if CONFIG_PCI_MSI not set
  IB/qib: Fix extra log level in qib_early_err()
  RDMA/cxgb4: Remove unnecessary KERN_<level> use
  RDMA/cxgb3: Remove unnecessary KERN_<level> use
  IB/core: Add link layer type information to sysfs
  IB/mlx4: Add VLAN support for IBoE
  IB/core: Add VLAN support for IBoE
  IB/mlx4: Add support for IBoE
  mlx4_en: Change multicast promiscuous mode to support IBoE
  mlx4_core: Update data structures and constants for IBoE
  mlx4_core: Allow protocol drivers to find corresponding interfaces
  IB/uverbs: Return link layer type to userspace for query port operation
  IB/srp: Sync buffer before posting send
  IB/srp: Use list_first_entry()
  IB/srp: Reduce number of BUSY conditions
  IB/srp: Eliminate two forward declarations
  IB/mlx4: Signal node desc changes to SM by using FW to generate trap 144
  IB: Replace EXTRA_CFLAGS with ccflags-y
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/hw/nes/nes_cm.c
Simple merge

diff --cc drivers/infiniband/hw/nes/nes_verbs.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

diff --cc drivers/net/mlx4/en_main.c
Simple merge

diff --cc drivers/net/mlx4/en_netdev.c
Simple merge

diff --cc drivers/net/mlx4/en_port.c
Simple merge

diff --cc drivers/net/mlx4/en_port.h
Simple merge

diff --cc drivers/net/mlx4/fw.c
Simple merge

diff --cc drivers/net/mlx4/main.c
Simple merge

diff --cc drivers/net/mlx4/mlx4_en.h
Simple merge

diff --cc include/linux/mlx4/cmd.h
index 78a1b96717523ba47b84867fc875aacef4f51e20,ddbe81261d5dc0d4c92f4a126b547ee478a402b2..9a18667c13cc02a0709e648d339b0c72278887d0
--- 1/include/linux/mlx4/cmd.h
--- 2/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@@ -56,8 -56,8 +56,9 @@@ enum 
        MLX4_CMD_QUERY_HCA       = 0xb,
        MLX4_CMD_QUERY_PORT      = 0x43,
        MLX4_CMD_SENSE_PORT      = 0x4d,
 +      MLX4_CMD_HW_HEALTH_CHECK = 0x50,
        MLX4_CMD_SET_PORT        = 0xc,
+       MLX4_CMD_SET_NODE        = 0x5a,
        MLX4_CMD_ACCESS_DDR      = 0x2e,
        MLX4_CMD_MAP_ICM         = 0xffa,
        MLX4_CMD_UNMAP_ICM       = 0xff9,

diff --cc include/linux/mlx4/device.h
Simple merge