From: Mukesh Kacker <mukesh.kacker@oracle.com>
Date: Wed, 21 Oct 2015 15:09:05 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes' into topic/uek-4.1/ofed
X-Git-Tag: v4.1.12-92~251^2~1^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=369b9d06bbeef658e93ced857e7bb096a3f44e12;p=users%2Fjedix%2Flinux-maple.git

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

* topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes:
  mlx4: indicate memory resource exhaustion
  IB/mlx4: Use correct order of variables in log message
  mlx4_core: Introduce restrictions for PD update
---

369b9d06bbeef658e93ced857e7bb096a3f44e12