From: Mukesh Kacker <mukesh.kacker@oracle.com>
Date: Thu, 9 Jul 2015 21:05:44 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/ofed.mlnx2.4-p1' into topic/uek-4.1/ofed
X-Git-Tag: v4.1.12-92~319^2^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9300c477a2f7ffaf732d9821e437da3a4bd8d05c;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/ofed.mlnx2.4-p1' into topic/uek-4.1/ofed

* topic/uek-4.1/ofed.mlnx2.4-p1: (23 commits)
  mlx4_vnic: Kconfig and Makefile changes
  mlx4_vnic: add mlx4_vnic
  mlx4_ib: add blue flame support for kernel consumers
  net/mlx4_core: add sanity check when creating bitmap structure
  net/mlx4_core: unmap clear register in case of error flow
  ib_core: fix NULL pointer dereference
  mlx4_ib: contig support for control objects
  mlx4_core: fix wrong comment about the reason of subtract one from the max_cqes
  IB/core - Don't modify outgoing DR SMP if first part is LID routed
  net/mlx4: adjust initial value of vl_cap in mlx4_SET_PORT
  mlx4_core: Error message on mtt allocation failure
  IB/core: Control number of retries for SA to leave an MCG
  mlx4: reducing wait during SW reset for 500 msecs
  mlx4_ib: Do not enable blueflame sends if write combining is not available
  IB/core: Fix create_qp issue relates to qp group type
  mlx4_core: log_num_mtt handling
  mlx4_ib: Fix the SQ size of an RC QP to support masked atomic operation
  mlx4_ib: Use optimal numbers of MTT entries.
  mlx4_ib: set write-combining flag for userspace blueflame pages
  mlx4_core: limit min profile numbers
  ...
---

9300c477a2f7ffaf732d9821e437da3a4bd8d05c