From: Mukesh Kacker <mukesh.kacker@oracle.com>
Date: Wed, 12 Aug 2015 22:53:51 +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~305^2^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4951ccc2ee1de6587077596a38af37a192f1a757;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_vnic: Skip fip discover restart if pkey index not changed
---

4951ccc2ee1de6587077596a38af37a192f1a757