]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes' into topic/uek-4.1/ofed
authorMukesh Kacker <mukesh.kacker@oracle.com>
Wed, 21 Oct 2015 15:09:05 +0000 (08:09 -0700)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Wed, 21 Oct 2015 15:09:05 +0000 (08:09 -0700)
* 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


Trivial merge