From: David S. Miller Date: Sat, 2 Aug 2014 22:59:22 +0000 (-0700) Subject: Merge branch 'be2net-next' X-Git-Tag: v3.17-rc1~106^2~31 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=58e70b59407a2407d7033588ebf0186fd65fa963;p=~emulex%2Finfiniband.git Merge branch 'be2net-next' Sathya Perla says: ==================== be2net: patch set Patch 1 fixes a regression caused by a previous commit on net-next. Old versions of BE3 FW may not support cmds to re-provision (and hence optimize) resources/queues in SR-IOV config. Do not treat this FW cmd failure as fatal and fail the function initialization. Instead, just enable SR-IOV with the resources provided by the FW. Patch 2 ignores a VF mac address setting if the new mac is already active on the VF. Patch 3 adds support to delete a FW-dump via ethtool on Lancer adapters. ==================== Signed-off-by: David S. Miller --- 58e70b59407a2407d7033588ebf0186fd65fa963